X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=e62f1be389b66ebd815d091794cbf7c7d3a3ed0e;hb=d945813e0856bdd8b06c1cc6d00e4cf33c9ee4cd;hp=f683a362d5cb63cacff89ab41fff9e457edfd0d9;hpb=6017c061ebdb1722963b446233b4138d7a0c0947;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index f683a362..e62f1be3 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.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
@@ -82,7 +82,7 @@ PKG_CHECK_MODULES(XFT, [xft])
 AC_SUBST(XFT_CFLAGS)
 AC_SUBST(XFT_LIBS)
 
-PKG_CHECK_MODULES(XML, [libxml-2.0])
+PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.0])
 AC_SUBST(XML_CFLAGS)
 AC_SUBST(XML_LIBS)
 
@@ -136,6 +136,31 @@ else
   xcursor_found=no
 fi
 
+AC_ARG_ENABLE(xcomposite,
+  AC_HELP_STRING(
+    [--disable-xcomposite],
+    [disable use of the X Composite library. [[default=enabled]]]
+  ),
+  [enable_xcomposite=$enableval],
+  [enable_xcomposite=yes]
+)
+
+if test "$enable_xcomposite" = yes; then
+PKG_CHECK_MODULES(XCOMPOSITE, [xcomposite],
+  [
+    AC_DEFINE(USE_XCOMPOSITE, [1], [Use X Composite library])
+    AC_SUBST(XCOMPOSITE_CFLAGS)
+    AC_SUBST(XCOMPOSITE_LIBS)
+    xcomposite_found=yes
+  ],
+  [
+    xcomposite_found=no
+  ]
+)
+else
+  xcomposite_found=no
+fi
+
 dnl Check for session management
 X11_SM
 
@@ -158,12 +183,19 @@ 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
 AC_MSG_RESULT([Compiling with these options:
                Startup Notification... $sn_found
                X Cursor Library... $xcursor_found
+               X Composite Library... $xcomposite_found
                Session Management... $SM
                ])
 AC_MSG_RESULT([configure complete, now type "make"])