X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=a31fdf846f14caf0f0815852b8ab5cf3ecf1ce70;hb=4cd886e5188549ab48a11b70cb40b65efe916b6c;hp=c7545137b275d0ebabeedc0f420a8f9360002713;hpb=e5bb095ded1f423bc7422a30288b873e0e614a2c;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index c7545137..a31fdf84 100644
--- 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-alpha3], [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
@@ -33,7 +26,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)
@@ -49,9 +42,9 @@ PKG_CHECK_MODULES([GMODULE], [gmodule-2.0])
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-PKG_CHECK_MODULES(FC, [fontconfig])
-AC_SUBST(FC_CFLAGS)
-AC_SUBST(FC_LIBS)
+PKG_CHECK_MODULES(XFT, [xft])
+AC_SUBST(XFT_CFLAGS)
+AC_SUBST(XFT_LIBS)
 
 PKG_CHECK_MODULES(XML, [libxml-2.0])
 AC_SUBST(XML_CFLAGS)
@@ -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)
   ],
@@ -74,14 +67,14 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0],
     AC_SUBST(GTK_LIBS)
     use_gtk="yes"
 
-    PKG_CHECK_MODULES(GLADE, [libglade-2.0],
+    PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0],
       [
-        AC_SUBST(GLADE_CFLAGS)
-        AC_SUBST(GLADE_LIBS)
-        use_glade="yes"
+        AC_SUBST(GDK_PIXBUF_CFLAGS)
+        AC_SUBST(GDK_PIXBUF_LIBS)
+        use_gdk_pixbuf="yes"
       ],
       [
-        use_glade="no"
+        use_gdk_pixbuf="no"
         AC_MSG_WARN([disabling build of the configuration tool])
       ]
     )
@@ -91,7 +84,15 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0],
     AC_MSG_WARN([disabling build of the configuration tool])
   ]
 )
-AM_CONDITIONAL(OBCONF, [test "$use_gtk" = "yes" && test "$use_glade" = "yes"])
+AM_CONDITIONAL(OBCONF,
+               [test "$use_gtk" = "yes" && test "$use_gdk_pixbuf" = "yes"])
+
+# Check for session management
+X11_SM
+
+#EFENCE_LIBS=-lefence
+EFENCE_LIBS=""
+AC_SUBST(EFENCE_LIBS)
 
 # Check for X11 extensions
 X11_EXT_XKB
@@ -100,30 +101,12 @@ X11_EXT_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
-GL_DEVEL
-
-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
-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\"])