1 files changed, 101 insertions, 56 deletions

diff --git a/configure.in b/configure.in
index 7b58aa0..966d7b5 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,8 @@
 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)
+AC_PREREQ(2.52)
+AM_INIT_AUTOMAKE(fluxbox,0.9.0,no-define)
 
 dnl Determine default prefix
 test x$prefix = "xNONE" && prefix="$ac_default_prefix"
@@ -10,8 +11,7 @@ dnl Check for various flavors of UNIX(r)
 dnl AC_AIX
 dnl AC_ISC_POSIX
 
-dnl TODO: do this
-dnl AC_LANG_CPLUSPLUS
+AC_LANG_CPLUSPLUS
  
 dnl Locate required external software
 AC_PROG_CC
@@ -84,74 +84,54 @@ else
   AC_MSG_RESULT([no])
 fi
 AC_SUBST(SHAPE)
-
+CXXFLAGS="$CXXFLAGS $SHAPE"
 LIBS="$LIBS $Xext_lib"
 
 dnl Check for the Slit
-SLIT=""
 AC_MSG_CHECKING([whether to include the Slit])
 AC_ARG_ENABLE(
   slit, [  --enable-slit           include code for the Slit [default=yes]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    SLIT="-DSLIT"
+    AC_DEFINE(SLIT, 1, " compile with slit")
   else
     AC_MSG_RESULT([no])
   fi,
   AC_MSG_RESULT([yes])
-  SLIT="-DSLIT"
-)
-AC_SUBST(SLIT)
-
-dnl Check for the new WM Spec
-NEWWMSPEC=""
-AC_MSG_CHECKING([whether to include the new WM Spec (DOES NOTHING)])
-AC_ARG_ENABLE(
-  newspec,
-[  --enable-newspec        include code for the new WM Spec (DOES NOTHING)
-                          [default=no]],
-  if test x$enableval = "xyes"; then
-    AC_MSG_RESULT([yes])
-    NEWWMSPEC="-DNEWWMSPEC"   
-  else
-    AC_MSG_RESULT([no])
-  fi,
-  AC_MSG_RESULT([no])
+  AC_DEFINE(SLIT, 1, " compile with slit")
 )
-AC_SUBST(NEWWMSPEC)
-
 
-dnl Check for Interlacing
-INTERLACE=""
-AC_MSG_CHECKING([whether to include interlacing image code])
+AC_MSG_CHECKING([whether to include the new WM Spec])
 AC_ARG_ENABLE(
-  interlace, [  --enable-interlace      include code for image interlacing [default=yes]],
+  newwmspec,
+[  --enable-newwmspec        include code for the new WM Spec [default=yes]],
   if test x$enableval = "xyes"; then
-    AC_MSG_RESULT([yes])
-    INTERLACE="-DINTERLACE"
+        AC_MSG_RESULT([yes])
+        NEWWMSPEC=true
+    AC_DEFINE(USE_NEWWMSPEC, 1, " use extened window manager hints")
   else
     AC_MSG_RESULT([no])
+        NEWWMSPEC=false
   fi,
   AC_MSG_RESULT([yes])
-  INTERLACE="-DINTERLACE"
+  AC_DEFINE(USE_NEWWMSPEC, 1, " use extened window manager hints")
+  NEWWMSPEC=true
 )
-AC_SUBST(INTERLACE)
+AM_CONDITIONAL(NEWWMSPEC, test x$NEWWMSPEC = xtrue)
 
 dnl Check for ordered 8bpp dithering
-ORDEREDPSEUDO=""
 AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code])
 AC_ARG_ENABLE(ordered-pseudo,
 [  --enable-ordered-pseudo include code for ordered pseudocolor (8bpp)
                           dithering [default=no]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    ORDEREDPSEUDO="-DORDEREDPSEUDO" 
+        AC_DEFINE(ORDEREDPSEUDO, 1, "ordered dithering code")
   else
     AC_MSG_RESULT([no]) 
   fi,
   AC_MSG_RESULT([no])
 )
-AC_SUBST(ORDEREDPSEUDO)
 
 dnl Check whether to include debugging code
 DEBUG=""
@@ -160,29 +140,28 @@ 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 -fno-inline"
   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=""
 AC_MSG_CHECKING([whether to include NLS support])
 AC_ARG_ENABLE(nls,
   [  --enable-nls            include natural language support [default=yes]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    NLS="-DNLS"
+    AC_DEFINE(NLS, 1, "Natural language support")
   else
     AC_MSG_RESULT([no])
   fi,
   AC_MSG_RESULT([yes])
-  NLS="-DNLS"
+  AC_DEFINE(NLS, 1, "Natural language support")
 )
-AC_SUBST(NLS)
 
 AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4")
 
@@ -193,59 +172,116 @@ fi
 
 
 dnl Check for new timed pixmap cache
-TIMEDCACHE=""
 AC_MSG_CHECKING([whether to use the new timed pixmap cache])
 AC_ARG_ENABLE(
   timed-cache,
 [  --enable-timed-cache    use new timed pixmap cache [default=yes]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    TIMEDCACHE="-DTIMEDCACHE"
+    AC_DEFINE(TIMEDCACHE, 1, "timed cache")
   else
     AC_MSG_RESULT([no])
   fi,
   AC_MSG_RESULT([yes])
-  TIMEDCACHE="-DTIMEDCACHE"
+  AC_DEFINE(TIMEDCACHE, 1, "timed cache")
 )
-AC_SUBST(TIMEDCACHE)
 
 dnl Check KDE
-KDE=""
 AC_MSG_CHECKING([whether to have KDE slit support])
 AC_ARG_ENABLE(
   kde,
 [  --enable-kde            KDE slit support [default=no]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    KDE="-DKDE"
+    AC_DEFINE(KDE, 1, "KDE slit support")
   else
     AC_MSG_RESULT([no])
   fi,
   AC_MSG_RESULT([no])
 )
-AC_SUBST(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=yes]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    GNOME="-DGNOME"
+        AC_DEFINE(USE_GNOME, 1, "Gnome 1 support")
+        GNOME=true
   else
     AC_MSG_RESULT([no])
+        GNOME=false
   fi,
-  AC_MSG_RESULT([no])
+  AC_MSG_RESULT([yes])
+ AC_DEFINE(USE_GNOME, 1, "Gnome 1 support")
+ GNOME=true
+)
+AM_CONDITIONAL(GNOME, test x$GNOME = xtrue)
+
+AC_MSG_CHECKING([whether to have Xft support])
+AM_PATH_XFT(yes,
+        XFT=true,
+        XFT=false
+)
+
+if test "x$XFT" = "xtrue" ; then
+        AC_DEFINE(USE_XFT, 1, "antialias support")      
+        AC_MSG_CHECKING([Xft UTF-8 support])
+        AC_TRY_LINK([
+                        #include <X11/Xft/Xft.h>
+                ], [ XftDrawStringUtf8(0, 0, 0, 0, 0, 0, 0); return 0; ],
+                AC_DEFINE(HAVE_XFT_UTF8_STRING, 1, "Xft UTF8 support")
+                AC_MSG_RESULT(yes),
+                AC_MSG_RESULT(no)
+                )
+fi
+
+AM_CONDITIONAL(XFT, test x$XFT = xtrue)
+
+
+AC_MSG_CHECKING([whether to have Xmb (multibyte font, utf-8) support])
+AC_ARG_ENABLE(
+  xmb,
+[  --enable-xmb            Xmb (multibyte font, utf-8) support [default=yes]],
+  if test x$enableval = "xyes"; then
+        AC_MSG_RESULT([yes])
+        AC_DEFINE(USE_XMB, 1, "multibyte support")
+        MULTIBYTE=true
+  else
+    AC_MSG_RESULT([no])
+        MULTIBYTE=false
+  fi,  
+  AC_MSG_RESULT([yes])
+  AC_DEFINE(USE_XMB, 1, "multibyte support")
+  MULTIBYTE=true
 )
-AC_SUBST(GNOME)
+AM_CONDITIONAL(MULTIBYTE, test x$MULTIBYTE = xtrue)
+
+dnl Check for Xinerama support
+
+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([])
@@ -259,9 +295,13 @@ AC_MSG_RESULT([])
 
 dnl Output files
 AM_CONFIG_HEADER(config.h)
+
 AC_OUTPUT(Makefile
+version.h
 src/Makefile
+src/FbTk/Makefile
 util/Makefile
+util/fbrun/Makefile
 data/Makefile
 data/styles/Makefile
 doc/Makefile
@@ -275,5 +315,10 @@ nls/pt_BR/Makefile
 nls/ru_RU/Makefile
 nls/sv_SE/Makefile
 nls/tr_TR/Makefile
+nls/pt_PT/Makefile
+nls/bg_BG/Makefile
+nls/ja_JP/Makefile
+nls/lv_LV/Makefile
 nls/it_IT/Makefile
-version.h)
+nls/de_DE/Makefile
+)