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])
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)
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)
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=$enableval],
[enable_sn=yes]
dnl Check for X11 extensions
X11_EXT_XKB
X11_EXT_XRANDR
-X11_EXT_VIDMODE
X11_EXT_SHAPE
X11_EXT_XINERAMA
AC_MSG_RESULT
AC_MSG_RESULT([Compiling with these options:
- Pango... $pango_found
Startup Notification... $sn_found
Session Management... $SM
])