X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=configure.ac;h=801d94dc6e4dd1046ee95d87bb3b7131ef3c65f9;hb=395b9e155aafbc09024d811260da961498f8334d;hp=b6cadaac0ffe59af025bc2c35c51c33e2dc9fb6e;hpb=b1cc4b4fe307e6aacdb665587216669f48d5c769;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index b6cadaac..801d94dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,28 +1,28 @@
-AC_INIT([openbox], [2.90.0], [http://icculus.org/openbox])
-AC_CONFIG_SRCDIR([src/blackbox.cc])
-AM_INIT_AUTOMAKE
+AC_INIT([src/main.cc])
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([openbox], [2.90.0cvs])
 
-dnl Determine default prefix
-test "$prefix" = "NONE" && prefix="$ac_default_prefix"
+AC_PREREQ([2.50])
 
-dnl We're in the C++ world
-AC_LANG(C++)
+AC_PATH_PROG([regex_cmd], [sed])
+test -z $regex_cmd && AC_MSG_ERROR([sed not found])
 
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_INSTALL
 AC_PROG_LIBTOOL
+LIBTOOL="$LIBTOOL --silent"
+AC_PROG_INSTALL
 
-AC_CHECK_PROGS([regex_cmd], [sed])
-if test x$regex_cmd = "x"; then
-  AC_MSG_ERROR([error. sed is required to build the default menu file.])
-fi
+ALL_LINGUAS=""
+AM_GNU_GETTEXT
 
+AC_LANG(C++)
+	
 dnl Check what compiler we are using
 AC_MSG_CHECKING([for GCC])
 if test "$GCC" = "yes"; then
   AC_MSG_RESULT([yes])
-  CXXFLAGS="$CXXFLAGS -Wall -W -pedantic"
+  CPPFLAGS="$CPPFLAGS -Wall -W -pedantic"
 else
   AC_MSG_RESULT([no, trying other compilers])
   AC_MSG_CHECKING(for MIPSpro)
@@ -31,11 +31,11 @@ else
     AC_MSG_RESULT([no])
   else
     AC_MSG_RESULT([yes, version $mips_pro_ver.])
-    AC_MSG_CHECKING(for -LANG:std in CXXFLAGS)
-    lang_std_not_set=`echo $CXXFLAGS | grep "\-LANG:std"`
+    AC_MSG_CHECKING(for -LANG:std in CPPFLAGS)
+    lang_std_not_set=`echo $CPPFLAGS | grep "\-LANG:std"`
     if test "x$lang_std_not_set" = "x"; then
       AC_MSG_RESULT([not set, setting.])
-      CXXFLAGS="${CXXFLAGS} -LANG:std"
+      CPPFLAGS="${CPPFLAGS} -LANG:std"
     else
       AC_MSG_RESULT([already set.])
     fi
@@ -71,7 +71,7 @@ AC_ARG_ENABLE([debug],
   AC_MSG_RESULT([no])
   DEBUG="-DNDEBUG"
 )
-CXXFLAGS="$CXXFLAGS $DEBUG"
+CPPFLAGS="$CPPFLAGS $DEBUG"
 
 dnl Check for X headers and libraries
 AC_PATH_X
@@ -80,7 +80,7 @@ test "$no_x" = "yes" && AC_MSG_ERROR([No Xlibs found.])
 test -z "$x_includes" && x_includes="/usr/include"
 test -z "$x_libraries" && x_libraries="/usr/lib"
      
-CXXFLAGS="$CXXFLAGS $X_CXXFLAGS"
+CPPFLAGS="$CPPFLAGS $X_CPPFLAGS"
 LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS"
 LDFLAGS="$LDFLAGS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
 
@@ -166,28 +166,30 @@ AC_ARG_ENABLE([xinerama],
   AC_MSG_RESULT([no])
 )
 
-dnl Print results
-AC_MSG_RESULT([])
-AC_MSG_RESULT([	$PACKAGE version $VERSION configured successfully.])
-AC_MSG_RESULT([])
+AC_CONFIG_FILES([Makefile
+		m4/Makefile 
+		po/Makefile.in
+		intl/Makefile
+		otk/Makefile
+		src/Makefile
+		util/Makefile
+		util/epist/Makefile
+		doc/Makefile
+		doc/doxygen/Makefile
+		data/Makefile
+		data/styles/Makefile
+		version.h
+		])
+AC_OUTPUT
+
+AC_MSG_RESULT
+AC_MSG_RESULT([$PACKAGE version $VERSION configured successfully.])
+
+AC_MSG_RESULT
 AC_MSG_RESULT([Using '$prefix' for installation.])
 AC_MSG_RESULT([Using '$CXX' for C++ compiler.])
-AC_MSG_RESULT([Building with '$CXXFLAGS' for C++ compiler flags.])
+AC_MSG_RESULT([Building with '$CPPFLAGS' for C++ compiler flags.])
 AC_MSG_RESULT([Building with '$LIBS' for linker flags.])
-AC_MSG_RESULT([])
-
-
-dnl Output files
-AM_CONFIG_HEADER(config.h)
-AC_CONFIG_FILES([
-  Makefile
-  otk/Makefile
-  src/Makefile
-  util/Makefile
-  util/epist/Makefile
-  doc/Makefile
-  data/Makefile
-  data/styles/Makefile
-  version.h
-])
-AC_OUTPUT
\ No newline at end of file
+AC_MSG_RESULT
+AC_MSG_RESULT([configure complete, now type \"make\"])
+AC_MSG_RESULT
\ No newline at end of file