update the build system, using a single Makefile.am for a sexyass non-recursive make...

[chaz/openbox] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5eed912900f415f8ff2389f104c2598b4003a21e..d462ddc0f67d6df356921482bcfc456f06a901b4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [2.90.0cvs], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.0-alpha1], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([kernel/openbox.c])
 
@@ -12,18 +12,11 @@ test "$SED" || AC_MSG_ERROR([sed not found])
 # Determine build target
 OB_DEBUG
 # 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
@@ -59,7 +52,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)
   ],
@@ -93,6 +86,13 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0],
 )
 AM_CONDITIONAL(OBCONF, [test "$use_gtk" = "yes" && test "$use_glade" = "yes"])
 
+# Check for session management
+X11_SM
+
+#EFENCE_LIBS=-lefence
+EFENCE_LIBS=""
+AC_SUBST(EFENCE_LIBS)
+
 # Check for X11 extensions
 X11_EXT_XKB
 X11_EXT_XRANDR
@@ -100,21 +100,11 @@ X11_EXT_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
-AC_CONFIG_FILES([Makefile
-                 po/Makefile.in
-                 themes/Makefile
-                data/Makefile
-                 render/Makefile
-                parser/Makefile
-                 kernel/Makefile
-                plugins/Makefile
-                plugins/resistance/Makefile
-                plugins/placement/Makefile
-                plugins/mouse/Makefile
-                plugins/keyboard/Makefile
-                plugins/menu/Makefile
-                tools/Makefile
-                tools/obconf/Makefile])
+AC_CONFIG_FILES([
+  Makefile
+  m4/Makefile
+  po/Makefile.in
+])
 AC_OUTPUT
 
 AC_MSG_RESULT