Don't replace ~ when we shouldn't

[dana/openbox.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 795b774..bba1b5c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.4.2], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.999.0], [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=15
+OB_MICRO_VERSION=16
 OB_INTERFACE_AGE=0
 OB_BINARY_AGE=0
 OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
@@ -70,7 +70,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)
 
@@ -96,7 +96,7 @@ AC_ARG_ENABLE(startup-notification,
 )
 
 if test "$enable_sn" = yes; then
-PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0],
+PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0 >= 0.8],
   [
     AC_DEFINE(USE_LIBSN, [1], [Use startup-notification])
     AC_SUBST(LIBSN_CFLAGS)
@@ -136,51 +136,6 @@ 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(XRENDER, [xrender],
-  [
-    AC_DEFINE(USE_XRENDER, [1], [Use X Render library])
-    AC_SUBST(XRENDER_CFLAGS)
-    AC_SUBST(XRENDER_LIBS)
-    PKG_CHECK_MODULES(XDAMAGE, [xdamage],
-      [
-        AC_DEFINE(USE_XDAMAGE, [1], [Use X Damage library])
-        AC_SUBST(XDAMAGE_CFLAGS)
-        AC_SUBST(XDAMAGE_LIBS)
-        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
-          ]
-        )
-      ],
-      [
-        xcomposite_found=no
-      ]
-    )
-  ],
-  [
-    xcomposite_found=no
-  ]
-)
-else
-  xcomposite_found=no
-fi
-
 dnl Check for session management
 X11_SM
 
@@ -215,7 +170,6 @@ 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"])