finally fix the autoconf stuff correctly

diff --git a/configure.ac b/configure.ac
index 0da4293044daeff70efb8a88af8cd8e1db7d9440..440b982402edfeea16a2eacd3f98a0518095b0b8 100644 (file)
--- 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.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)
@@ -76,11 +76,11 @@ 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]]]
+    [--disable-pango],
+    [disable the pango library for better display of international fonts. [[default=yes]]]
   ),
-  [enable_pango=yes],
-  [enable_pango=no]
+  [enable_pango=$enableval],
+  [enable_pango=yes]
 )
 
 if test "$enable_pango" = yes; then
@@ -110,7 +110,7 @@ AC_ARG_ENABLE(startup-notification,
     [--disable-startup-notification],
     [disable the startup notification library. [[default=yes]]]
   ),
-  [enable_sn=no],
+  [enable_sn=$enableval],
   [enable_sn=yes]
 )