X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=80441ffacf584d7d104f389ebaeb50ec5875fbc0;hb=c18edc32aa7d5ce50655918b9969859bab21f94d;hp=efe02a1795377c913dd0957b2d48c5092641f77c;hpb=63360f74b798c0b76f9c033595db3722b3b56ad5;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index efe02a17..80441ffa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,82 +1,138 @@
-AC_PREREQ([2.50])
-AC_INIT([kernel/openbox.c])
-# AC_CONFIG_HEADERS(config.h)
-AC_LANG([C])
-AC_ENABLE_STATIC([no])
-AC_ENABLE_SHARED([yes])
+AC_PREREQ([2.54])
+AC_INIT([openbox], [3.3.1], [http://bugzilla.icculus.org])
+AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR([openbox/openbox.c])
 
-AC_PREFIX_DEFAULT([/usr/local])
-if test "$prefix" = "NONE"; then
-  prefix=$ac_default_prefix
-  ac_configure_args="$ac_configure_args --prefix $prefix"
-fi
+dnl Making releases:
+dnl   OB_MICRO_VERSION += 1;
+dnl   OB_INTERFACE_AGE += 1;
+dnl   OB_BINARY_AGE += 1;
+dnl if any functions have been added, set OB_INTERFACE_AGE to 0.
+dnl if backwards compatibility has been broken,
+dnl set OB_BINARY_AGE and OB_INTERFACE_AGE to 0.
+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=3
+OB_MICRO_VERSION=5
+OB_INTERFACE_AGE=1
+OB_BINARY_AGE=5
+OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
 
-AM_INIT_AUTOMAKE([openbox], [2.90.0cvs])
+AC_SUBST(OB_MAJOR_VERSION)
+AC_SUBST(OB_MINOR_VERSION)
+AC_SUBST(OB_MICRO_VERSION)
+AC_SUBST(OB_INTERFACE_AGE)
+AC_SUBST(OB_BINARY_AGE)
+AC_SUBST(OB_VERSION)
 
-AC_PATH_PROG([SED], [sed])
-test "$SED" || AC_MSG_ERROR([sed not found])
+dnl Libtool versioning
+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`
+LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
-AM_MAINTAINER_MODE
-# Determine build target
+AC_SUBST(LT_RELEASE)
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+AC_SUBST(LT_AGE)
+AC_SUBST(LT_CURRENT_MINUS_AGE)
+
+AC_PREFIX_DEFAULT([/usr/local])
+test "$prefix" = "NONE" && prefix=$ac_default_prefix
+
+dnl Determine build target
 OB_DEBUG
-# Pick compiler specific/build target flags, and set $CVS
+dnl Pick compiler specific/build target flags, and set $CVS
+AM_PROG_CC_C_O
 OB_COMPILER_FLAGS
+AC_C_CONST
+AC_C_INLINE
 
-PKG_CHECK_MODULES([GLIB], [glib-2.0])
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-	
-PKG_CHECK_MODULES([GMODULE], [gmodule-2.0])
-AC_SUBST(GMODULE_CFLAGS)
-AC_SUBST(GMODULE_LIBS)
-	
 AC_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
 LIBTOOL="$LIBTOOL --silent"
+
 AC_PROG_INSTALL
 
-ALL_LINGUAS=""
-AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT_VERSION(0.12.1)
 AM_GNU_GETTEXT([external])
 
-AC_CHECK_HEADERS(ctype.h fcntl.h locale.h signal.h string.h stdlib.h)
+AC_CHECK_HEADERS(ctype.h fcntl.h locale.h signal.h string.h stdio.h stdlib.h)
 AC_CHECK_HEADERS(unistd.h sys/stat.h sys/select.h sys/time.h sys/wait.h)
 # AC_HEADER_TIME
 # AC_TYPE_SIGNAL
 
-PKG_CHECK_MODULES(XFT, xft)
-AC_SUBST(XFT_CFLAGS)
-AC_SUBST(XFT_LIBS)
+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)
 
-# Check for X11 extensions
+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_SUBST(XML_LIBS)
+
+AC_ARG_ENABLE(startup-notification,
+  AC_HELP_STRING(
+    [--enable-startup-notification],
+    [enable the startup notification library. [[default=enabled]]]
+  ),
+  [enable_sn=$enableval],
+  [enable_sn=yes]
+)
+
+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
+  ],
+  [
+    sn_found=no
+  ]
+)
+else
+  sn_found=no
+fi
+
+dnl Check for session management
+X11_SM
+
+#EFENCE_LIBS=-lefence
+EFENCE_LIBS=""
+AC_SUBST(EFENCE_LIBS)
+
+dnl Check for X11 extensions
 X11_EXT_XKB
+X11_EXT_XRANDR
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
-AC_CONFIG_FILES([Makefile po/Makefile.in
-		kernel/Makefile
-		render/Makefile
-		engines/Makefile
-		engines/openbox/Makefile
-		plugins/Makefile
-		plugins/keyboard/Makefile
-		plugins/mouse/Makefile
-		plugins/placement/Makefile
-		doc/Makefile
-		doc/doxygen/Makefile
-		data/Makefile
-		data/buttons/Makefile
-		themes/Makefile
-		themes/openbox/Makefile])
+AC_CONFIG_FILES([
+  Makefile
+  m4/Makefile
+  po/Makefile.in
+  render/obrender-3.0.pc
+  parser/obparser-3.0.pc
+  version.h
+])
 AC_OUTPUT
 
 AC_MSG_RESULT
-AC_MSG_RESULT([$PACKAGE version $VERSION configured successfully.])
-
-AC_MSG_RESULT
-if test "$DEBUG" = "yes"; then
-  AC_MSG_RESULT([Creating a DEBUG build.])
-else
-  AC_MSG_RESULT([Creating a RELEASE build.])
-fi
-AC_MSG_RESULT
-AC_MSG_RESULT([configure complete, now type \"make\"])
+AC_MSG_RESULT([Compiling with these options:
+               Startup Notification... $sn_found
+               Session Management... $SM
+               ])
+AC_MSG_RESULT([configure complete, now type "make"])