1 files changed, 36 insertions, 7 deletions

diff --git a/configure.in b/configure.in
index 7b58aa0..cf23feb 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl configure.in for Fluxbox  - created from configure.in Blackbox 0.61.1
 dnl Initialize autoconf and automake
 AC_INIT(src/main.cc)
-AM_INIT_AUTOMAKE(fluxbox,0.1.5,no-define)
+AM_INIT_AUTOMAKE(fluxbox,0.1.10-cvs,no-define)
 
 dnl Determine default prefix
 test x$prefix = "xNONE" && prefix="$ac_default_prefix"
@@ -17,7 +17,6 @@ dnl Locate required external software
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
-AM_PROG_LIBTOOL
 
 AC_CHECK_PROGS(regex_cmd, sed)
 if test x$regex_cmd = "x"; then
@@ -84,7 +83,7 @@ else
   AC_MSG_RESULT([no])
 fi
 AC_SUBST(SHAPE)
-
+CXXFLAGS="$CXXFLAGS $SHAPE"
 LIBS="$LIBS $Xext_lib"
 
 dnl Check for the Slit
@@ -102,6 +101,7 @@ AC_ARG_ENABLE(
   SLIT="-DSLIT"
 )
 AC_SUBST(SLIT)
+CXXFLAGS="$CXXFLAGS $SLIT"
 
 dnl Check for the new WM Spec
 NEWWMSPEC=""
@@ -119,7 +119,7 @@ AC_ARG_ENABLE(
   AC_MSG_RESULT([no])
 )
 AC_SUBST(NEWWMSPEC)
-
+CXXFLAGS="$CXXFLAGS $NEWWMSPEC"
 
 dnl Check for Interlacing
 INTERLACE=""
@@ -136,6 +136,7 @@ AC_ARG_ENABLE(
   INTERLACE="-DINTERLACE"
 )
 AC_SUBST(INTERLACE)
+CXXFLAGS="$CXXFLAGS $INTERLACE"
 
 dnl Check for ordered 8bpp dithering
 ORDEREDPSEUDO=""
@@ -152,6 +153,7 @@ AC_ARG_ENABLE(ordered-pseudo,
   AC_MSG_RESULT([no])
 )
 AC_SUBST(ORDEREDPSEUDO)
+CXXFLAGS="$CXXFLAGS $ORDEREDPSEUDO"
 
 dnl Check whether to include debugging code
 DEBUG=""
@@ -160,13 +162,14 @@ AC_ARG_ENABLE(debug,
   [  --enable-debug          include verbose debugging code [default=no]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    DEBUG="-DDEBUG"             
+    DEBUG="-DDEBUG"
   else
     AC_MSG_RESULT([no])
   fi,
   AC_MSG_RESULT([no])
 )
 AC_SUBST(DEBUG)
+CXXFLAGS="$CXXFLAGS $DEBUG"
 
 dnl Check whether to include natural language support (i18n)
 NLS=""
@@ -183,6 +186,7 @@ AC_ARG_ENABLE(nls,
   NLS="-DNLS"
 )
 AC_SUBST(NLS)
+CXXFLAGS="$CXXFLAGS $NLS"
 
 AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4")
 
@@ -208,6 +212,7 @@ AC_ARG_ENABLE(
   TIMEDCACHE="-DTIMEDCACHE"
 )
 AC_SUBST(TIMEDCACHE)
+CXXFLAGS="$CXXFLAGS $TIMEDCACHE"
 
 dnl Check KDE
 KDE=""
@@ -224,13 +229,14 @@ AC_ARG_ENABLE(
   AC_MSG_RESULT([no])
 )
 AC_SUBST(KDE)
+CXXFLAGS="$CXXFLAGS $KDE"
 
 dnl Check GNOME
 GNOME=""
 AC_MSG_CHECKING([whether to have GNOME support])
 AC_ARG_ENABLE(
   gnome,
-[  --enable-gnome            GNOME support [default=no] (DEVELOPMENT)],
+[  --enable-gnome            GNOME support [default=no]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
     GNOME="-DGNOME"
@@ -240,12 +246,31 @@ AC_ARG_ENABLE(
   AC_MSG_RESULT([no])
 )
 AC_SUBST(GNOME)
+CXXFLAGS="$CXXFLAGS $GNOME"
+
+dnl Check for Xinerama support
+XINERAMA=""
+AC_MSG_CHECKING([whether to build support for the Xinerama extension])
+AC_ARG_ENABLE(xinerama,
+[  --enable-xinerama       enable xinerama extension [default=no]], , [enable_xinerama=no])
+
+if test "x$enable_xinerama" = "xyes"; then
+        AC_MSG_RESULT([yes])
+        AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
+                        XINERAMA="-DXINERAMA"; Xinerama_libs="-lXinerama", )
+else
+        AC_MSG_RESULT([no])
+fi
+AC_SUBST(XINERAMA)
+CXXFLAGS="$CXXFLAGS $XINERAMA"
+
+LIBS="$LIBS $Xinerama_libs"
 
 dnl Determine the return type of signal handlers
 AC_TYPE_SIGNAL
 
 dnl Determine if maintainer portions of the Makefiles should be included.
-AM_MAINTAINER_MODE
+dnl AM_MAINTAINER_MODE
 
 dnl Print results
 AC_MSG_RESULT([])
@@ -262,6 +287,7 @@ AM_CONFIG_HEADER(config.h)
 AC_OUTPUT(Makefile
 src/Makefile
 util/Makefile
+util/fbrun/Makefile
 data/Makefile
 data/styles/Makefile
 doc/Makefile
@@ -276,4 +302,7 @@ nls/ru_RU/Makefile
 nls/sv_SE/Makefile
 nls/tr_TR/Makefile
 nls/it_IT/Makefile
+nls/pt_PT/Makefile
+nls/bg_BG/Makefile
+nls/ja_JP/Makefile
 version.h)