Pango! yay. Patch mostly by Mohammed Sameer, fixed some memleaks and ifdeffed by...

[chaz/openbox] / configure.ac

diff --git a/configure.ac b/configure.ac
index ebba7b70b11ddc1a14d387a5e248afe84bc1c2ae..45db7eb3b30933250c0013fb884f89d0ac669d64 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.0-rc3], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.2], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([openbox/openbox.c])
 
@@ -15,7 +15,7 @@ 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=1
+OB_MICRO_VERSION=2
 OB_INTERFACE_AGE=0
 OB_BINARY_AGE=1
 OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
@@ -73,6 +73,18 @@ fi
 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_SUBST(PANGO_CFLAGS)
+AC_SUBST(PANGO_LIBS)
+DEFS="$DEFS -DUSE_PANGO"
+fi
        
 PKG_CHECK_MODULES(XFT, [xft])
 AC_SUBST(XFT_CFLAGS)
@@ -113,6 +125,7 @@ AC_CONFIG_FILES([
   po/Makefile.in
   render/obrender-3.0.pc
   parser/obparser-3.0.pc
+  version.h
 ])
 AC_OUTPUT