X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=50c2a47ff7a077e8c2b45b9886585a0d0db38f8f;hb=c356d51a1ead21ca4ab9c08e8c8b043fdfe5bb26;hp=2f4c0e0a51c9c2fa68e2db9056409801e8aab745;hpb=fa67faf88c6e9c62dcbac838b6dc1c572ea9831a;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index 2f4c0e0a..50c2a47f 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.3.996], [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=12 OB_INTERFACE_AGE=0 OB_BINARY_AGE=0 OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION @@ -74,11 +74,15 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.6.0]) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) -PKG_CHECK_MODULES(PANGO, [pango >= 1.16.0 pangoxft >= 1.8.0]) +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) @@ -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