Fix the ~ expansion regex

[dana/openbox.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 122cd39..bba1b5c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.1], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.999.0], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([openbox/openbox.c])
 
@@ -14,10 +14,10 @@ dnl
 dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
 dnl
 OB_MAJOR_VERSION=3
-OB_MINOR_VERSION=0
-OB_MICRO_VERSION=2
+OB_MINOR_VERSION=4
+OB_MICRO_VERSION=16
 OB_INTERFACE_AGE=0
-OB_BINARY_AGE=1
+OB_BINARY_AGE=0
 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)
@@ -67,31 +67,74 @@ AC_CHECK_HEADERS(unistd.h sys/stat.h sys/select.h sys/time.h sys/wait.h)
 
 AC_PATH_PROG([SED], [sed], [no])
 if test "$SED" = "no"; then
-  AC_MSG_ERROR([The program "sed" is not avaiable. This program is required to build Openbox.])
+  AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.])
 fi
 
-PKG_CHECK_MODULES([GLIB], [glib-2.0])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0])
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
-       
+
+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])
+PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.0])
 AC_SUBST(XML_CFLAGS)
 AC_SUBST(XML_LIBS)
 
-PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0],
+AC_ARG_ENABLE(startup-notification,
+  AC_HELP_STRING(
+    [--disable-startup-notification],
+    [disable the startup notification library. [[default=enabled]]]
+  ),
+  [enable_sn=$enableval],
+  [enable_sn=yes]
+)
+
+if test "$enable_sn" = yes; then
+PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0 >= 0.8],
   [
     AC_DEFINE(USE_LIBSN, [1], [Use startup-notification])
     AC_SUBST(LIBSN_CFLAGS)
     AC_SUBST(LIBSN_LIBS)
+    sn_found=yes
+  ],
+  [
+    sn_found=no
+  ]
+)
+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])
+    AC_SUBST(XCURSOR_CFLAGS)
+    AC_SUBST(XCURSOR_LIBS)
+    xcursor_found=yes
   ],
   [
-    no_such_luck=yes
+    xcursor_found=no
   ]
 )
+else
+  xcursor_found=no
+fi
 
 dnl Check for session management
 X11_SM
@@ -103,9 +146,9 @@ AC_SUBST(EFENCE_LIBS)
 dnl Check for X11 extensions
 X11_EXT_XKB
 X11_EXT_XRANDR
-X11_EXT_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
+X11_EXT_SYNC
 
 AC_CONFIG_FILES([
   Makefile
@@ -115,7 +158,18 @@ 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([configure complete, now type \"make\"])
+AC_MSG_RESULT([Compiling with these options:
+               Startup Notification... $sn_found
+               X Cursor Library... $xcursor_found
+               Session Management... $SM
+               ])
+AC_MSG_RESULT([configure complete, now type "make"])