X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=920af39297aacc5fdc80f71f99b4dab56fadf30f;hb=0a69cfc6d2cf672634e95d5eb2015434dd924abc;hp=7b0cef4e375bc09c90e60b7c88b647a41f7402e4;hpb=9c0fc10024f00883af7b1b5ee34f1cfc6ad3b7fb;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 7b0cef4e..920af392 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.50])
-AC_INIT([src/main.cc])
-#AC_CONFIG_HEADERS(config.h)
+AC_INIT([kernel/openbox.c])
+# AC_CONFIG_HEADERS(config.h)
 AC_LANG([C])
 AC_ENABLE_STATIC([no])
 AC_ENABLE_SHARED([yes])
@@ -13,10 +13,8 @@ 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
@@ -24,15 +22,14 @@ OB_DEBUG
 # Pick compiler specific/build target flags, and set $CVS
 OB_COMPILER_FLAGS
 
-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
 AC_PROG_LIBTOOL
 LIBTOOL="$LIBTOOL --silent"
 AC_PROG_INSTALL
@@ -41,7 +38,7 @@ ALL_LINGUAS=""
 AM_GNU_GETTEXT_VERSION(0.11.5)
 AM_GNU_GETTEXT([external])
 
-AC_CHECK_HEADERS(ctype.h fcntl.h locale.h process.h signal.h string.h stdlib.h)
+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_HEADER_TIME
 # AC_TYPE_SIGNAL
@@ -56,20 +53,20 @@ X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
 AC_CONFIG_FILES([Makefile po/Makefile.in
-		c/Makefile
 		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
-		])
+		themes/openbox/Makefile])
 AC_OUTPUT
 
 AC_MSG_RESULT