X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=2d84162ffe502f587e7339048b24a78edcbcab4a;hb=d82048b4e515303673edf853cc64dd585f0b310a;hp=39b07ad32ce329cb406253de28f1506a8e682c82;hpb=e103f90c2f0e73a3fad71f5445916ed1081cb2a3;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 39b07ad3..2d84162f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.50])
 AC_INIT([kernel/openbox.c])
-#AC_CONFIG_HEADERS(config.h)
+# AC_CONFIG_HEADERS(config.h)
 AC_LANG([C])
 AC_ENABLE_STATIC([no])
 AC_ENABLE_SHARED([yes])
@@ -13,26 +13,26 @@ 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([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, and set $CVS
 OB_COMPILER_FLAGS
+AC_C_CONST
+AC_C_INLINE
 
-PKG_CHECK_MODULES(GLIB, glib-2.0)
+PKG_CHECK_MODULES([GLIB], [glib-2.0])
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 	
-PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
+PKG_CHECK_MODULES([GMODULE], [gmodule-2.0])
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
-	
-AC_PROG_LN_S
+
+AM_PROG_LEX	
 AC_PROG_LIBTOOL
 LIBTOOL="$LIBTOOL --silent"
 AC_PROG_INSTALL
@@ -41,8 +41,8 @@ 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 stdlib.h)
-AC_CHECK_HEADERS(unistd.h sys/select.h sys/time.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
 
@@ -56,7 +56,6 @@ X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
 AC_CONFIG_FILES([Makefile po/Makefile.in
-		c/Makefile
 		kernel/Makefile
 		render/Makefile
 		engines/Makefile
@@ -70,8 +69,7 @@ AC_CONFIG_FILES([Makefile po/Makefile.in
 		data/Makefile
 		data/buttons/Makefile
 		themes/Makefile
-		themes/openbox/Makefile
-		])
+		themes/openbox/Makefile])
 AC_OUTPUT
 
 AC_MSG_RESULT