merge the C branch into HEAD

[dana/openbox.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b83776f..dc1404c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.50])
 AC_INIT([src/main.cc])
-AC_CONFIG_HEADERS(config.h)
-AC_LANG([C++])
+#AC_CONFIG_HEADERS(config.h)
+AC_LANG([C])
 AC_ENABLE_STATIC([no])
 AC_ENABLE_SHARED([yes])
 
@@ -13,23 +13,27 @@ fi
 
 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([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
 OB_COMPILER_FLAGS
-AC_C_BIGENDIAN
 
-SWIG_PROG(1.3.14)
-SWIG_ENABLE_CXX
-SWIG_MULTI_MODULE_SUPPORT
-SWIG_PYTHON
+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)
+       
+PYTHON_DEVEL
+
 AC_PROG_LN_S
 AC_PROG_LIBTOOL
 LIBTOOL="$LIBTOOL --silent"
@@ -39,12 +43,14 @@ ALL_LINGUAS=""
 AM_GNU_GETTEXT_VERSION(0.11.5)
 AM_GNU_GETTEXT([external])
 
-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 stdlib.h unistd.h)
+AC_CHECK_HEADERS(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(XFT, xft)
+AC_SUBST(XFT_CFLAGS)
+AC_SUBST(XFT_LIBS)
 
 # Check for X11 extensions
 X11_EXT_XKB
@@ -52,16 +58,18 @@ X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
 AC_CONFIG_FILES([Makefile po/Makefile.in
-               otk/Makefile
-               src/Makefile
-               tools/Makefile
-               wrap/Makefile
-               scripts/Makefile
+               c/Makefile
+               kernel/Makefile
+               render/Makefile
+               engines/Makefile
+               engines/openbox/Makefile
+               python/Makefile
                doc/Makefile
                doc/doxygen/Makefile
                data/Makefile
                data/buttons/Makefile
-               data/styles/Makefile
+               themes/Makefile
+               themes/openbox/Makefile
                ])
 AC_OUTPUT
 
@@ -74,10 +82,5 @@ if test "$DEBUG" = "yes"; then
 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\"])