X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=45db7eb3b30933250c0013fb884f89d0ac669d64;hb=e7d1ba6ae343ae3e3f2d97a1fc853422c5b8c3e5;hp=299bcd358a4ba36a228ebad158f46de62755edcf;hpb=2bbcbcf1e6c22d848d77d4720a9abeca546cce41;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 299bcd35..45db7eb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.0-beta3], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.2], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([openbox/openbox.c])
 
@@ -15,9 +15,9 @@ 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=0
+OB_MICRO_VERSION=2
 OB_INTERFACE_AGE=0
-OB_BINARY_AGE=0
+OB_BINARY_AGE=1
 OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
 
 AC_SUBST(OB_MAJOR_VERSION)
@@ -28,7 +28,7 @@ AC_SUBST(OB_BINARY_AGE)
 AC_SUBST(OB_VERSION)
 
 dnl Libtool versioning
-LT_RELEASE=$VERSION
+LT_RELEASE=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
 LT_CURRENT=`expr $OB_MICRO_VERSION - $OB_INTERFACE_AGE`
 LT_REVISION=$OB_INTERFACE_AGE
 LT_AGE=`expr $OB_BINARY_AGE - $OB_INTERFACE_AGE`
@@ -57,7 +57,6 @@ LIBTOOL="$LIBTOOL --silent"
 
 AC_PROG_INSTALL
 
-ALL_LINGUAS=""
 AM_GNU_GETTEXT_VERSION(0.12.1)
 AM_GNU_GETTEXT([external])
 
@@ -66,9 +65,26 @@ AC_CHECK_HEADERS(unistd.h sys/stat.h sys/select.h sys/time.h sys/wait.h)
 # AC_HEADER_TIME
 # AC_TYPE_SIGNAL
 
+AC_PATH_PROG([SED], [sed], [no])
+if test "$SED" = "no"; then
+  AC_MSG_ERROR([The program "sed" is not avaiable. This program is required to build Openbox.])
+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)
@@ -109,6 +125,7 @@ AC_CONFIG_FILES([
   po/Makefile.in
   render/obrender-3.0.pc
   parser/obparser-3.0.pc
+  version.h
 ])
 AC_OUTPUT