diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox-0.1.14.orig/Makefile.am fluxbox-0.1.14/Makefile.am
--- fluxbox-0.1.14.orig/Makefile.am	2002-08-05 01:55:42.000000000 +1000
+++ fluxbox-0.1.14/Makefile.am	2003-09-11 01:09:59.000000000 +1000
@@ -2,6 +2,7 @@
 
 SUBDIRS = data doc nls src util
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
+ACLOCAL_AMFLAGS = -I .
 
 uninstall-local:
 	rmdir $(pkgdatadir)
diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox-0.1.14.orig/configure.in fluxbox-0.1.14/configure.in
--- fluxbox-0.1.14.orig/configure.in	2002-12-08 12:38:52.000000000 +1100
+++ fluxbox-0.1.14/configure.in	2003-09-11 01:04:09.000000000 +1000
@@ -31,7 +31,31 @@
 
 dnl Check for existance of basename(), setlocale() and strftime()
 AC_CHECK_FUNCS(basename, , AC_CHECK_LIB(gen, basename, LIBS="$LIBS -lgen"))
-AC_CHECK_FUNCS(getpid setlocale sigaction strftime strcasestr snprintf vsnprintf catopen catgets catclose)
+AC_CHECK_FUNCS(getpid setlocale sigaction strcasestr snprintf vsnprintf catopen catgets catclose)
+dnl The autoconf test for strftime is broken now (due to gcc 3.3 bug?):
+dnl Gcc 3.3 testprog = ``extern "C" char strftime;'', build with g++ test.cc
+dnl breaks with:
+dnl   test.cc:1: error: nonnull argument with out-of-range operand number 
+dnl   (arg 1, operand 3)
+
+
+AC_MSG_CHECKING(for strftime)
+
+AC_COMPILE_IFELSE(
+[AC_LANG_PROGRAM([#include <time.h>],
+[[
+char * s;
+time_t t = time(NULL);
+size_t x = strftime(s, 5, "%a", localtime(&t));
+]]
+)],
+[
+        AC_DEFINE(HAVE_STRFTIME, 1, [Define to 1 if you have the 'strftime' func
+tion.])
+        AC_MSG_RESULT(yes)
+],
+[AC_MSG_RESULT(no)])
+
 AC_CHECK_LIB(nsl, t_open, LIBS="$LIBS -lnsl")
 AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
 
diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox-0.1.14.orig/xft.m4 fluxbox-0.1.14/xft.m4
--- fluxbox-0.1.14.orig/xft.m4	1970-01-01 10:00:00.000000000 +1000
+++ fluxbox-0.1.14/xft.m4	2003-09-11 00:59:04.000000000 +1000
@@ -0,0 +1,97 @@
+# xft.m4
+# Copyright (c) 2002 Henrik Kinnunen (fluxgen at linuxmail.org)
+
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the 
+# Software is furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in 
+# all copies or substantial portions of the Software. 
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+# DEALINGS IN THE SOFTWARE.
+
+# AM_PATH_XFT1([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+AC_DEFUN(AM_PATH_XFT1,
+[
+	AC_CHECK_LIB(Xft, XftFontOpen,
+		XFT_LIBS="-lXft"
+		[$1],
+		[$2]
+	)
+])
+
+# AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+AC_DEFUN(AM_PATH_XFT2,
+[
+	if test x$pkg_exec_prefix != x ; then
+	   xft_args="$xft_args --exec-prefix=$pkg_exec_prefix"
+	   if test x${PKG_CONFIG+set} != xset ; then
+	       PKG_CONFIG=$pkg_exec_prefix/bin/pkg-config
+    fi
+fi
+
+if test x$xft_prefix != x ; then
+   xft_args="$xft_args --prefix=$xft_prefix"
+   if test x${PKG_CONFIG+set} != xset ; then
+      PKG_CONFIG=$xft_prefix/bin/pkg-config	  
+   fi
+fi
+
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test "x$PKG_CONFIG" = "xno" ; then
+	ifelse([$2], , :, [$2])
+else 
+	XFT_CFLAGS=`$PKG_CONFIG $xftconf_args --cflags xft`
+	XFT_LIBS=`$PKG_CONFIG $xftconf_args --libs xft`
+	ifelse([$1], , :, [$1])
+fi
+
+])
+
+# AM_PATH_XFT(default-value, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+# Test for Xft, and define XFT_CFLAGS and XFT_LIBS
+AC_DEFUN(AM_PATH_XFT,
+[
+ AC_ARG_WITH(xft-prefix,[  --with-xft-prefix=path  Prefix where Xft is installed (optional)],
+            xft_prefix="$withval", xft_prefix="")
+ AC_ARG_WITH(pkg-exec-prefix,[  --with-pkg-exec-prefix=path Exec prefix where pkg-config is installed (optional)],
+            pkg_exec_prefix="$withval", pkg_exec_prefix="")
+ AC_ARG_ENABLE(xft, [  --enable-xft            Xft (antialias) support (default=$1)],
+	if test "x$enableval" = "xyes"; then
+		TRY_XFT=yes
+	else
+		TRY_XFT=no
+	fi
+	,
+	TRY_XFT=$1
+ )
+
+if test "x$TRY_XFT" = "xyes"; then
+	AC_MSG_RESULT(yes)
+	AM_PATH_XFT2(
+		[$2],
+		# xft2 failed: try xft1
+		AM_PATH_XFT1(
+		[$2],
+		[$3]
+		AC_MSG_RESULT([Cant find Xft libraries! Disabling Xft]))
+	)
+else
+	AC_MSG_RESULT(no)
+	[$3]
+fi
+
+CFLAGS="$CFLAGS $XFT_CFLAGS"
+CXXFLAGS="$CXXFLAGS $XFT_CFLAGS"
+LIBS="$LIBS $XFT_LIBS"
+
+])
--- fluxbox-0.1.14.orig/Makefile	2003-09-11 01:18:58.000000000 +1000
+++ fluxbox-0.1.14/Makefile	2003-09-11 01:34:41.000000000 +1000
@@ -96,6 +96,7 @@
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I .
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = version.h