?

[chaz/openbox] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9738faa9f16f3b4412b6a5e3d116cc0f8431f0a9..d8fac47d0c5615f1ed1e2b88a7c9f1fe1514aba0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.3-rc2], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.4.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=3
-OB_MICRO_VERSION=3
-OB_INTERFACE_AGE=1
-OB_BINARY_AGE=3
+OB_MINOR_VERSION=4
+OB_MICRO_VERSION=6
+OB_INTERFACE_AGE=0
+OB_BINARY_AGE=0
 OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
 
 AC_SUBST(OB_MAJOR_VERSION)
@@ -74,32 +74,9 @@ 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)
+PKG_CHECK_MODULES(PANGO, [pango pangoxft])
+AC_SUBST(PANGO_CFLAGS)
+AC_SUBST(PANGO_LIBS)
 
 PKG_CHECK_MODULES(XML, [libxml-2.0])
 AC_SUBST(XML_CFLAGS)
@@ -108,10 +85,10 @@ AC_SUBST(XML_LIBS)
 AC_ARG_ENABLE(startup-notification,
   AC_HELP_STRING(
     [--enable-startup-notification],
-    [enable the startup notification library. [[default=no]]]
+    [enable the startup notification library. [[default=enabled]]]
   ),
   [enable_sn=$enableval],
-  [enable_sn=no]
+  [enable_sn=yes]
 )
 
 if test "$enable_sn" = yes; then
@@ -155,7 +132,6 @@ AC_OUTPUT
 
 AC_MSG_RESULT
 AC_MSG_RESULT([Compiling with these options:
-               Pango... $pango_found
                Startup Notification... $sn_found
                Session Management... $SM
                ])