X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=e33f375d19a3a89bef85c2e0c181f8f86f9f8e11;hb=bc12dc05a436210e43f48e7ec784fbba310e4497;hp=dcc0fb2e4322250bd611040fc2a204450c5cd790;hpb=926074bf3a4dfe8428bfc358c1d13b7328d93b3a;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index dcc0fb2e..e33f375d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,19 +1,14 @@
-AC_PREREQ([2.50])
-AC_INIT([openbox], [2.90.0cvs], [http://bugzilla.icculus.org])
-# AC_CONFIG_HEADERS(config.h)
-AC_LANG([C])
-AC_ENABLE_STATIC([no])
-AC_ENABLE_SHARED([yes])
+AC_PREREQ([2.54])
+AC_INIT([openbox], [3.0-alpha1], [http://bugzilla.icculus.org])
+AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR([kernel/openbox.c])
 
 AC_PREFIX_DEFAULT([/usr/local])
 test "$prefix" = "NONE" && prefix=$ac_default_prefix
 
-##AM_INIT_AUTOMAKE([openbox], [2.90.0cvs])
-
 AC_PATH_PROG([SED], [sed])
 test "$SED" || AC_MSG_ERROR([sed not found])
 
-##AM_MAINTAINER_MODE
 # Determine build target
 OB_DEBUG
 # Pick compiler specific/build target flags, and set $CVS
@@ -21,6 +16,23 @@ 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.11.5)
+AM_GNU_GETTEXT([external])
+
+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([GLIB], [glib-2.0])
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
@@ -29,55 +41,85 @@ PKG_CHECK_MODULES([GMODULE], [gmodule-2.0])
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-AC_PATH_PROG([FLEX], [flex])
-test "$FLEX" || AC_MSG_ERROR([flex not found])
+PKG_CHECK_MODULES(XFT, [xft])
+AC_SUBST(XFT_CFLAGS)
+AC_SUBST(XFT_LIBS)
+
+PKG_CHECK_MODULES(XML, [libxml-2.0])
+AC_SUBST(XML_CFLAGS)
+AC_SUBST(XML_LIBS)
 
-AC_PATH_PROG([BISON], [bison])
-test "BISON" || AC_MSG_ERROR([bison not found])
+PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0],
+  [
+    AC_DEFINE(USE_LIBSN)
+    AC_SUBST(LIBSN_CFLAGS)
+    AC_SUBST(LIBSN_LIBS)
+  ],
+  [
+    no_such_luck=yes
+  ]
+)
 
-AC_PROG_LIBTOOL
-LIBTOOL="$LIBTOOL --silent"
-AC_PROG_INSTALL
+PKG_CHECK_MODULES(GTK, [gtk+-2.0],
+  [
+    AC_SUBST(GTK_CFLAGS)
+    AC_SUBST(GTK_LIBS)
+    use_gtk="yes"
 
-##ALL_LINGUAS=""
-##AM_GNU_GETTEXT_VERSION(0.11.5)
-##AM_GNU_GETTEXT([external])
+    PKG_CHECK_MODULES(GLADE, [libglade-2.0],
+      [
+        AC_SUBST(GLADE_CFLAGS)
+        AC_SUBST(GLADE_LIBS)
+        use_glade="yes"
+      ],
+      [
+        use_glade="no"
+        AC_MSG_WARN([disabling build of the configuration tool])
+      ]
+    )
+  ],
+  [
+    use_gtk="no"
+    AC_MSG_WARN([disabling build of the configuration tool])
+  ]
+)
+AM_CONDITIONAL(OBCONF, [test "$use_gtk" = "yes" && test "$use_glade" = "yes"])
 
-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
+# Check for session management
+X11_SM
 
-PKG_CHECK_MODULES(XFT, xft)
-AC_SUBST(XFT_CFLAGS)
-AC_SUBST(XFT_LIBS)
+#EFENCE_LIBS=-lefence
+EFENCE_LIBS=""
+AC_SUBST(EFENCE_LIBS)
 
 # Check for X11 extensions
 X11_EXT_XKB
+X11_EXT_XRANDR
+X11_EXT_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
-AC_CONFIG_FILES([build/Makefile.incl])
-# 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
+                 themes/Makefile
+                 themes/ebox_data/Makefile
+                 themes/fieron_data/Makefile
+                 themes/fieron2_data/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_OUTPUT
 
-AC_MSG_RESULT
-AC_MSG_RESULT([$PACKAGE_NAME version $PACKAGE_VERSION configured successfully.])
-
 AC_MSG_RESULT
 if test "$DEBUG" = "yes"; then
   AC_MSG_RESULT([Creating a DEBUG build.])