X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=a9281dc36f399adf902e438af47570a91512817a;hb=5d665673a29be21fe4ecad870d0a2d4f5c2f308d;hp=b83776fad98c0844fadf40efd51bac8d8aab0c1a;hpb=7fe3301e7ea905a8a76d54c22751f3d8a346e28b;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index b83776fa..a9281dc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,83 +1,74 @@
 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_INIT([openbox], [2.90.0cvs], [http://bugzilla.icculus.org])
+AC_CONFIG_SRCDIR([kernel/openbox.c])
+AC_CONFIG_AUX_DIR([build])
 
 AC_PREFIX_DEFAULT([/usr/local])
-if test "$prefix" = "NONE"; then
-  prefix=$ac_default_prefix
-  ac_configure_args="$ac_configure_args --prefix $prefix"
-fi
-
-AM_INIT_AUTOMAKE([openbox], [2.90.0cvs])
+test "$prefix" = "NONE" && prefix=$ac_default_prefix
 
-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])
+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
+# Pick compiler specific/build target flags, and set $CVS
 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
+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
+AC_SUBST(LIBTOOL_DEPS)
 LIBTOOL="$LIBTOOL --silent"
+
 AC_PROG_INSTALL
 
-ALL_LINGUAS=""
-AM_GNU_GETTEXT_VERSION(0.11.5)
-AM_GNU_GETTEXT([external])
+OB_NLS
+## XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ##
+##ALL_LINGUAS=""
+##AM_GNU_GETTEXT_VERSION(0.11.5)
+##AM_GNU_GETTEXT([external])
+## XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ##
 
-AC_CHECK_HEADERS(fcntl.h signal.h stdarg.h stdint.h unistd.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h)
+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([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)
 
 # Check for X11 extensions
 X11_EXT_XKB
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
-AC_CONFIG_FILES([Makefile po/Makefile.in
-		otk/Makefile
-		src/Makefile
-		tools/Makefile
-		wrap/Makefile
-		scripts/Makefile
-		doc/Makefile
-		doc/doxygen/Makefile
-		data/Makefile
-		data/buttons/Makefile
-		data/styles/Makefile
-		])
+AC_CONFIG_FILES([Makefile build/Makefile.incl])
 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\"])