X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=bb85c396b0452fccd7bbcb48017cfb114451621d;hb=e6a8595fc1d1a8f207875c5f1495c5eec56bbe0c;hp=f9b64a69d786bd9b7b96c558f3631d29af1ee55c;hpb=bbc22b9870ba2a9e28452f78a0ec8d91a24b749e;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index f9b64a69..bb85c396 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.0-beta1], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.3], [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=0
+OB_MINOR_VERSION=3
+OB_MICRO_VERSION=4
 OB_INTERFACE_AGE=0
-OB_BINARY_AGE=0
+OB_BINARY_AGE=4
 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`
@@ -51,15 +51,12 @@ OB_COMPILER_FLAGS
 AC_C_CONST
 AC_C_INLINE
 
-AC_DISABLE_STATIC
-AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 LIBTOOL="$LIBTOOL --silent"
 
 AC_PROG_INSTALL
 
-ALL_LINGUAS=""
 AM_GNU_GETTEXT_VERSION(0.12.1)
 AM_GNU_GETTEXT([external])
 
@@ -68,10 +65,38 @@ 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 available. 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(
+    [--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)
@@ -80,16 +105,30 @@ PKG_CHECK_MODULES(XML, [libxml-2.0])
 AC_SUBST(XML_CFLAGS)
 AC_SUBST(XML_LIBS)
 
+AC_ARG_ENABLE(startup-notification,
+  AC_HELP_STRING(
+    [--enable-startup-notification],
+    [enable the startup notification library. [[default=no]]]
+  ),
+  [enable_sn=$enableval],
+  [enable_sn=no]
+)
+
+if test "$enable_sn" = yes; then
 PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0],
   [
     AC_DEFINE(USE_LIBSN, [1], [Use startup-notification])
     AC_SUBST(LIBSN_CFLAGS)
     AC_SUBST(LIBSN_LIBS)
+    sn_found=yes
   ],
   [
-    no_such_luck=yes
+    sn_found=no
   ]
 )
+else
+  sn_found=no
+fi
 
 dnl Check for session management
 X11_SM
@@ -101,7 +140,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
 
@@ -111,8 +149,14 @@ AC_CONFIG_FILES([
   po/Makefile.in
   render/obrender-3.0.pc
   parser/obparser-3.0.pc
+  version.h
 ])
 AC_OUTPUT
 
 AC_MSG_RESULT
-AC_MSG_RESULT([configure complete, now type \"make\"])
+AC_MSG_RESULT([Compiling with these options:
+               Pango... $pango_found
+               Startup Notification... $sn_found
+               Session Management... $SM
+               ])
+AC_MSG_RESULT([configure complete, now type "make"])