X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=eb52e7e137e33a60c61062ebb7919958ab8c07a5;hb=bca8082d6d09a16a116c70001469a576b93157ce;hp=ed5d08928fc5e4c49dc16e5b27aa16478ebdd278;hpb=0603b502830caf0458c921e59dcf1fb2c80bb210;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index ed5d0892..eb52e7e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,45 +1,54 @@
 AC_PREREQ([2.50])
-AC_INIT([kernel/openbox.c])
+AC_INIT([openbox], [2.90.0cvs], [http://bugzilla.icculus.org])
 # AC_CONFIG_HEADERS(config.h)
 AC_LANG([C])
 AC_ENABLE_STATIC([no])
 AC_ENABLE_SHARED([yes])
 
 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])
+##AM_INIT_AUTOMAKE([openbox], [2.90.0cvs])
 
-AC_CHECK_PROG([SED], [sed])
+AC_PATH_PROG([SED], [sed])
 test "$SED" || AC_MSG_ERROR([sed not found])
 
-AM_MAINTAINER_MODE
+##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
+
+# XXX ADD --disable-nls option to this XXX
+CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
+# XXX                                  XXX
 
-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_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])
+
 AC_PROG_LIBTOOL
 LIBTOOL="$LIBTOOL --silent"
 AC_PROG_INSTALL
 
-ALL_LINGUAS=""
-AM_GNU_GETTEXT_VERSION(0.11.5)
-AM_GNU_GETTEXT([external])
+##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
 
@@ -52,26 +61,24 @@ X11_EXT_XKB
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
-AC_CONFIG_FILES([Makefile po/Makefile.in
-		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])
+AC_CONFIG_FILES([build/Makefile.incl])
+# po/Makefile.in
+#		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])
 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.])