X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=53e50013683365eb030912601724f9605f47087b;hb=662a6356c64ae86fffaf8cf386b47dedc2c0822d;hp=b6c7803f61b02074705c7cfb5bbc72fe27d71d46;hpb=442c1680d9b73f6fbfb4587278fb5adfbdcc40df;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index b6c7803f..53e50013 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.54]) -AC_INIT([openbox], [3.4.0], [http://bugzilla.icculus.org]) +AC_INIT([openbox], [3.999.0], [http://bugzilla.icculus.org]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([openbox/openbox.c]) @@ -15,7 +15,7 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match dnl OB_MAJOR_VERSION=3 OB_MINOR_VERSION=4 -OB_MICRO_VERSION=6 +OB_MICRO_VERSION=16 OB_INTERFACE_AGE=0 OB_BINARY_AGE=0 OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION @@ -78,7 +78,11 @@ PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0 pangoxft >= 1.8.0]) AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_LIBS) -PKG_CHECK_MODULES(XML, [libxml-2.0]) +PKG_CHECK_MODULES(XFT, [xft]) +AC_SUBST(XFT_CFLAGS) +AC_SUBST(XFT_LIBS) + +PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.0]) AC_SUBST(XML_CFLAGS) AC_SUBST(XML_LIBS) @@ -92,7 +96,7 @@ AC_ARG_ENABLE(startup-notification, ) if test "$enable_sn" = yes; then -PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0], +PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0 >= 0.8], [ AC_DEFINE(USE_LIBSN, [1], [Use startup-notification]) AC_SUBST(LIBSN_CFLAGS) @@ -154,6 +158,12 @@ AC_CONFIG_FILES([ parser/obparser-3.0.pc version.h ]) +AC_CONFIG_COMMANDS([doc], + [test -d doc || mkdir doc]) +AC_CONFIG_COMMANDS([data], + [test -d data || mkdir data]) +AC_CONFIG_COMMANDS([data/xsession], + [test -d data/xsession || mkdir data/xsession]) AC_OUTPUT AC_MSG_RESULT