X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=78d0753e172615d7088eee014f13b8d80d5396af;hb=c02c825cb8f18f0170b312ea8d4b3f4d491bff40;hp=bfcff7a1c36a488a7e7ce4fc85d890f54256308e;hpb=5960d27b1c35c58d3c1731c71c44b9c61328a34d;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index bfcff7a1..78d0753e 100644 --- a/configure.ac +++ b/configure.ac @@ -15,17 +15,17 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match dnl RR_MAJOR_VERSION=4 RR_MINOR_VERSION=0 -RR_MICRO_VERSION=16 +RR_MICRO_VERSION=17 RR_INTERFACE_AGE=0 RR_BINARY_AGE=0 -RR_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION +RR_VERSION=$RR_MAJOR_VERSION.$RR_MINOR_VERSION OBT_MAJOR_VERSION=4 OBT_MINOR_VERSION=0 OBT_MICRO_VERSION=0 OBT_INTERFACE_AGE=0 OBT_BINARY_AGE=0 -OBT_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION +OBT_VERSION=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION AC_SUBST(RR_MAJOR_VERSION) AC_SUBST(RR_MINOR_VERSION) @@ -94,7 +94,7 @@ if test "$SED" = "no"; then AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.]) fi -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.6.0]) +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0]) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) @@ -102,10 +102,6 @@ PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0 pangoxft >= 1.8.0]) AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_LIBS) -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) @@ -179,9 +175,9 @@ AC_CONFIG_FILES([ m4/Makefile po/Makefile.in render/obrender-4.0.pc - parser/obparser-4.0.pc obt/obt-4.0.pc - version.h + render/version.h + obt/version.h ]) AC_CONFIG_COMMANDS([doc], [test -d doc || mkdir doc])