remove obconf from this tree.

[mikachu/openbox.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 21fc521..f9b64a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,29 +1,56 @@
-AC_PREREQ([2.50])
-AC_INIT([openbox], [2.90.0cvs], [http://bugzilla.icculus.org])
+AC_PREREQ([2.54])
+AC_INIT([openbox], [3.0-beta1], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR([kernel/openbox.c])
+AC_CONFIG_SRCDIR([openbox/openbox.c])
+
+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=0
+OB_MICRO_VERSION=0
+OB_INTERFACE_AGE=0
+OB_BINARY_AGE=0
+OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
+
+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)
+
+dnl Libtool versioning
+LT_RELEASE=$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`
+
+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
 
-AC_PATH_PROG([SED], [sed])
-test "$SED" || AC_MSG_ERROR([sed not found])
-
-# Determine build target
+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
 
-if test "$CVS" = "yes"; then
-    AC_PATH_PROG([FLEX], [flex])
-    test "$FLEX" || AC_MSG_ERROR([flex not found])
-
-    AC_PATH_PROG([BISON], [bison])
-    test "BISON" || AC_MSG_ERROR([bison not found])
-fi
-
 AC_DISABLE_STATIC
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
@@ -33,7 +60,7 @@ 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 stdio.h stdlib.h)
@@ -45,10 +72,6 @@ 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)
-
 PKG_CHECK_MODULES(XFT, [xft])
 AC_SUBST(XFT_CFLAGS)
 AC_SUBST(XFT_LIBS)
@@ -59,7 +82,7 @@ AC_SUBST(XML_LIBS)
 
 PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0],
   [
-    AC_DEFINE(USE_LIBSN)
+    AC_DEFINE(USE_LIBSN, [1], [Use startup-notification])
     AC_SUBST(LIBSN_CFLAGS)
     AC_SUBST(LIBSN_LIBS)
   ],
@@ -68,33 +91,28 @@ PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0],
   ]
 )
 
-# Check for X11 extensions
+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_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
-GL_OPTION
-
-AC_CONFIG_FILES([Makefile
-                 po/Makefile.in
-                 themes/Makefile
-                data/Makefile
-                 render/Makefile
-                 kernel/Makefile
-                plugins/Makefile
-                plugins/placement/Makefile
-                plugins/mouse/Makefile
-                plugins/keyboard/Makefile
-                plugins/menu/Makefile])
+AC_CONFIG_FILES([
+  Makefile
+  m4/Makefile
+  po/Makefile.in
+  render/obrender-3.0.pc
+  parser/obparser-3.0.pc
+])
 AC_OUTPUT
 
 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\"])