X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=a55d4f4eeb1c464e652c7ba35c62695ea5da405b;hb=df50b6bbd4e3a16885669743e6aa5c671b7a0730;hp=4b85d8077089448cf662ad9b97ca5c5067536599;hpb=c567f5937b09708848c6b83c29f808f3d44145cc;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 4b85d807..a55d4f4e 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.995], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([openbox/openbox.c])
 
@@ -15,9 +15,9 @@ 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_INTERFACE_AGE=0
-OB_BINARY_AGE=0
+OB_MICRO_VERSION=11
+OB_INTERFACE_AGE=5
+OB_BINARY_AGE=5
 OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
 
 AC_SUBST(OB_MAJOR_VERSION)
@@ -57,7 +57,7 @@ LIBTOOL="$LIBTOOL --silent"
 
 AC_PROG_INSTALL
 
-AM_GNU_GETTEXT_VERSION(0.12.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,14 +78,18 @@ 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])
 AC_SUBST(XML_CFLAGS)
 AC_SUBST(XML_LIBS)
 
 AC_ARG_ENABLE(startup-notification,
   AC_HELP_STRING(
-    [--enable-startup-notification],
-    [enable the startup notification library. [[default=enabled]]]
+    [--disable-startup-notification],
+    [disable the startup notification library. [[default=enabled]]]
   ),
   [enable_sn=$enableval],
   [enable_sn=yes]
@@ -107,6 +111,16 @@ else
   sn_found=no
 fi
 
+AC_ARG_ENABLE(xcursor,
+  AC_HELP_STRING(
+    [--disable-xcursor],
+    [disable use of the X Cursor library. [[default=enabled]]]
+  ),
+  [enable_xcursor=$enableval],
+  [enable_xcursor=yes]
+)
+
+if test "$enable_xcursor" = yes; then
 PKG_CHECK_MODULES(XCURSOR, [xcursor],
   [
     AC_DEFINE(USE_XCURSOR, [1], [Use X Cursor library])
@@ -118,6 +132,9 @@ PKG_CHECK_MODULES(XCURSOR, [xcursor],
     xcursor_found=no
   ]
 )
+else
+  xcursor_found=no
+fi
 
 dnl Check for session management
 X11_SM
@@ -131,6 +148,7 @@ X11_EXT_XKB
 X11_EXT_XRANDR
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
+X11_EXT_SYNC
 
 AC_CONFIG_FILES([
   Makefile
@@ -140,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