Merge branch 'master' of git://orodu.net/openbox

[mikachu/openbox.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 65304f5..c06fdaa 100644 (file)
--- 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.4.2], [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=15
 OB_INTERFACE_AGE=0
 OB_BINARY_AGE=0
 OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
@@ -57,7 +57,7 @@ LIBTOOL="$LIBTOOL --silent"
 
 AC_PROG_INSTALL
 
-AM_GNU_GETTEXT_VERSION(0.16.1)
+AM_GNU_GETTEXT_VERSION(0.15)
 AM_GNU_GETTEXT([external])
 
 AC_CHECK_HEADERS(ctype.h fcntl.h locale.h signal.h string.h stdio.h stdlib.h)
@@ -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)
 
@@ -144,6 +148,7 @@ X11_EXT_XKB
 X11_EXT_XRANDR
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
+X11_EXT_SYNC
 
 AC_CONFIG_FILES([
   Makefile
@@ -153,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