X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=d8fac47d0c5615f1ed1e2b88a7c9f1fe1514aba0;hb=d34741f58c0732e7c720bbe7aa4cd063f9db92d1;hp=0da4293044daeff70efb8a88af8cd8e1db7d9440;hpb=ca9c3e2c145a8441a1b64b3f2eba1fb41eb4ec97;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 0da42930..d8fac47d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.2], [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=0
-OB_MICRO_VERSION=2
+OB_MINOR_VERSION=4
+OB_MICRO_VERSION=6
 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)
@@ -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(
-    [--enable-pango],
-    [enable the pango library for better display of international fonts. [[default=no]]]
-  ),
-  [enable_pango=yes],
-  [enable_pango=no]
-)
-
-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)
@@ -107,10 +84,10 @@ AC_SUBST(XML_LIBS)
 
 AC_ARG_ENABLE(startup-notification,
   AC_HELP_STRING(
-    [--disable-startup-notification],
-    [disable the startup notification library. [[default=yes]]]
+    [--enable-startup-notification],
+    [enable the startup notification library. [[default=enabled]]]
   ),
-  [enable_sn=no],
+  [enable_sn=$enableval],
   [enable_sn=yes]
 )
 
@@ -140,7 +117,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
 
@@ -156,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
                ])