X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=9738faa9f16f3b4412b6a5e3d116cc0f8431f0a9;hb=d77c8f62f2f908cfe1d09686a35dce1ccaf65aec;hp=2b2c43b3dbc1b2421b509c51a500c0297c6c717f;hpb=3603c20b4edb524a2ee08825ffb098b439efcc92;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 2b2c43b3..9738faa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.0], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.3-rc2], [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_INTERFACE_AGE=0
-OB_BINARY_AGE=1
+OB_MINOR_VERSION=3
+OB_MICRO_VERSION=3
+OB_INTERFACE_AGE=1
+OB_BINARY_AGE=3
 OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
 
 AC_SUBST(OB_MAJOR_VERSION)
@@ -67,13 +67,36 @@ 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])
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
-	
+
+AC_ARG_ENABLE(pango,
+  AC_HELP_STRING(
+    [--disable-pango],
+    [disable the pango library [[default=yes]]]
+  ),
+  [enable_pango=$enableval],
+  [enable_pango=yes]
+)
+
+if test "$enable_pango" = yes; then
+PKG_CHECK_MODULES([PANGO], [pango pangoxft],
+  [
+    AC_DEFINE(USE_PANGO, [1], [Use Pango])
+    AC_SUBST(PANGO_CFLAGS)
+    AC_SUBST(PANGO_LIBS)
+    pango_found=yes
+  ],
+    pango_found=no
+)
+else
+  pango_found=no
+fi
+
 PKG_CHECK_MODULES(XFT, [xft])
 AC_SUBST(XFT_CFLAGS)
 AC_SUBST(XFT_LIBS)
@@ -82,16 +105,30 @@ 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=no]]]
+  ),
+  [enable_sn=$enableval],
+  [enable_sn=no]
+)
+
+if test "$enable_sn" = yes; then
 PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0],
   [
     AC_DEFINE(USE_LIBSN, [1], [Use startup-notification])
     AC_SUBST(LIBSN_CFLAGS)
     AC_SUBST(LIBSN_LIBS)
+    sn_found=yes
   ],
   [
-    no_such_luck=yes
+    sn_found=no
   ]
 )
+else
+  sn_found=no
+fi
 
 dnl Check for session management
 X11_SM
@@ -103,7 +140,6 @@ AC_SUBST(EFENCE_LIBS)
 dnl Check for X11 extensions
 X11_EXT_XKB
 X11_EXT_XRANDR
-X11_EXT_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
@@ -118,4 +154,9 @@ AC_CONFIG_FILES([
 AC_OUTPUT
 
 AC_MSG_RESULT
-AC_MSG_RESULT([configure complete, now type \"make\"])
+AC_MSG_RESULT([Compiling with these options:
+               Pango... $pango_found
+               Startup Notification... $sn_found
+               Session Management... $SM
+               ])
+AC_MSG_RESULT([configure complete, now type "make"])