X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=98c376d4970cf48c748d4c0ec8d5f1a1367face7;hb=3e7b4478ee8fdfd5c255723c006ac9292582e747;hp=3511aa424ff26cf22f73bca3172850c18a7ef4ea;hpb=7c8c9e998ffc3a9b22e15feeffe77823142ce531;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 3511aa42..98c376d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,82 +1,105 @@
-AC_PREREQ([2.50])
-AC_INIT([src/main.cc])
-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-alpha8], [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
+test "$prefix" = "NONE" && prefix=$ac_default_prefix
 
-AM_INIT_AUTOMAKE([openbox], [2.90.0cvs])
-
-AC_PATH_PROG([awk_cmd], [awk]) # used by swig.m4
-test "$awk_cmd" || AC_MSG_ERROR([awk not found])
-AC_PATH_PROG([regex_cmd], [sed])
-test "$regex_cmd" || AC_MSG_ERROR([sed not found])
-
-AM_MAINTAINER_MODE
 # Determine build target
 OB_DEBUG
-# Pick compiler specific/build target flags
+# Pick compiler specific/build target flags, and set $CVS
+AM_PROG_CC_C_O
 OB_COMPILER_FLAGS
-AC_C_BIGENDIAN
+AC_C_CONST
+AC_C_INLINE
 
-SWIG_PROG(1.3.14)
-SWIG_ENABLE_CXX
-SWIG_MULTI_MODULE_SUPPORT
-SWIG_PYTHON
-	
-AC_PROG_LN_S
+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_VERSION(0.12.1)
 AM_GNU_GETTEXT([external])
 
-AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdint.h stdio.h stdlib.h string.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h)
-AC_HEADER_TIME
+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 Xft2
-XFT_DEVEL(2.0.0)
+PKG_CHECK_MODULES([GLIB], [glib-2.0])
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_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)
+AC_SUBST(XML_LIBS)
+
+PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0],
+  [
+    AC_DEFINE(USE_LIBSN, [1], [Use startup-notification])
+    AC_SUBST(LIBSN_CFLAGS)
+    AC_SUBST(LIBSN_LIBS)
+  ],
+  [
+    no_such_luck=yes
+  ]
+)
+
+PKG_CHECK_MODULES(GTK, [gtk+-2.0],
+  [
+    AC_SUBST(GTK_CFLAGS)
+    AC_SUBST(GTK_LIBS)
+    use_gtk="yes"
+
+    PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0],
+      [
+        AC_SUBST(GDK_PIXBUF_CFLAGS)
+        AC_SUBST(GDK_PIXBUF_LIBS)
+        use_gdk_pixbuf="yes"
+      ],
+      [
+        use_gdk_pixbuf="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_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
+X11_EXT_XRANDR
+X11_EXT_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
-AC_CONFIG_FILES([Makefile po/Makefile.in
-		otk/Makefile
-		src/Makefile
-		wrap/Makefile
-		scripts/Makefile
-		doc/Makefile
-		doc/doxygen/Makefile
-		data/Makefile
-		data/buttons/Makefile
-		data/styles/Makefile
-		])
+AC_CONFIG_FILES([
+  Makefile
+  m4/Makefile
+  po/Makefile.in
+])
 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([Using '$prefix' for installation.])
-AC_MSG_RESULT([Using '$CXX' for C++ compiler.])
-AC_MSG_RESULT([Building with '$CPPFLAGS' for C++ preprocessor flags.])
-AC_MSG_RESULT([Building with '$CXXFLAGS' for C++ compiler flags.])
-AC_MSG_RESULT([Building with '$LIBS' for linker flags.])
 AC_MSG_RESULT
 AC_MSG_RESULT([configure complete, now type \"make\"])