build-sys: unify configure.ac syntax

1 files changed, 318 insertions, 230 deletions

diff --git a/configure.ac b/configure.ac
index c21aa77..f1bc6e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl Initialize autoconf and automake
-AC_PREREQ(2.52)
+AC_PREREQ([2.52])
 AC_INIT([fluxbox],
         [1.3.5],
-        [fluxbox-devel@lists.sourceforge.net],,
+        [fluxbox-devel@lists.sourceforge.net], [],
         [http://fluxbox.org/])
 AC_CONFIG_SRCDIR([src/fluxbox.cc])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -11,11 +11,7 @@ AC_USE_SYSTEM_EXTENSIONS
 AM_INIT_AUTOMAKE([foreign 1.10 tar-pax dist-bzip2 subdir-objects])
 
 dnl Determine default prefix
-AS_IF(test "x$prefix" = "xNONE",[prefix="$ac_default_prefix"])
-
-dnl Check for various flavors of UNIX(r)
-dnl AC_AIX
-dnl AC_ISC_POSIX
+AS_IF([test "x$prefix" = "xNONE"], [prefix="$ac_default_prefix"])
 
 AC_LANG_CPLUSPLUS
 
@@ -30,38 +26,70 @@ AC_C_INLINE
 
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
+AC_STRUCT_TM
 
+dnl Require pkg-config
 m4_ifndef([PKG_PROG_PKG_CONFIG],
-  [m4_fatal([Could not locate the pkg-config autoconf macros.  These are usually
+        [m4_fatal([Could not locate the pkg-config autoconf macros.  These are usually
 located in /usr/share/aclocal/pkg.m4.  If your macros are in a different
 location, try setting the environment variable
 export ACLOCAL_FLAGS="-I/other/macro/dir"
-before running ./autogen.sh or autoreconf again.])])
+before running ./autogen.sh or autoreconf again.])
+])
 PKG_PROG_PKG_CONFIG
 
-AC_CHECK_PROGS(regex_cmd, sed)
-AS_IF(test "x$regex_cmd" = "x",[AC_MSG_ERROR([error. sed is required to build the data files.])])
+dnl Check for sed
+AC_CHECK_PROGS([regex_cmd], [sed])
+AS_IF([test "x$regex_cmd" = "x"], [
+        AC_MSG_ERROR([error. sed is required to build the data files.])
+])
 
 dnl Check for system header files
 AC_HEADER_STDC
 AC_HEADER_STDBOOL
-AC_CHECK_HEADERS(errno.h ctype.h dirent.h fcntl.h libgen.h \
-                 locale.h math.h nl_types.h process.h signal.h stdarg.h \
-                 stdint.h stdio.h time.h unistd.h \
-                 sys/param.h sys/select.h sys/signal.h sys/stat.h \
-                 sys/time.h sys/types.h sys/wait.h \
-                 langinfo.h iconv.h)
-
-
-
-AC_CHECK_HEADERS(sstream,,[
-    AC_CHECK_HEADERS(strstream,,[
-        AC_MSG_ERROR([Your libstdc++ doesn't have the sstream or strstream classes])]
-        )]
-)
-
-AC_CHECK_HEADERS(cassert cctype cerrno cmath cstdarg cstdint cstdio cstdlib cstring ctime)
-
+AC_CHECK_HEADERS([ \
+        ctype.h \
+        dirent.h \
+        errno.h \
+        fcntl.h \
+        iconv.h \
+        langinfo.h \
+        libgen.h \
+        locale.h \
+        math.h \
+        nl_types.h \
+        process.h \
+        signal.h \
+        stdarg.h \
+        stdint.h \
+        stdio.h \
+        sys/param.h \
+        sys/select.h \
+        sys/signal.h \
+        sys/stat.h \
+        sys/time.h \
+        sys/types.h \
+        sys/wait.h \
+        time.h \
+        unistd.h \
+])
+AC_CHECK_HEADERS([ \
+        cassert \
+        cctype \
+        cerrno \
+        cmath \
+        cstdarg \
+        cstdint \
+        cstdio \
+        cstdlib \
+        cstring \
+        ctime \
+])
+AC_CHECK_HEADERS([sstream], [], [
+        AC_CHECK_HEADERS([strstream], [], [
+                AC_MSG_ERROR([Your libstdc++ doesn't have the sstream or strstream classes])
+        ])
+])
 
 dnl Check for existance of basename(), setlocale() and strftime()
 AC_FUNC_CLOSEDIR_VOID
@@ -72,10 +100,34 @@ AC_FUNC_REALLOC
 AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_STAT
 
-AC_CHECK_FUNCS(basename, , AC_CHECK_LIB(gen, basename, LIBS="-lgen $LIBS"))
-AC_CHECK_FUNCS(catclose catgets catopen getpid memset mkdir \
-    nl_langinfo putenv regcomp select setenv setlocale sigaction snprintf \
-    sqrt strcasecmp strcasestr strchr strstr strtol strtoul sync vsnprintf)
+AC_CHECK_FUNCS([basename], [], [
+        AC_CHECK_LIB([gen], [basename], [LIBS="-lgen $LIBS"])
+])
+AC_CHECK_FUNCS([ \
+        catclose \
+        catgets \
+        catopen \
+        getpid \
+        memset \
+        mkdir \
+        nl_langinfo \
+        putenv \
+        regcomp \
+        select \
+        setenv \
+        setlocale \
+        sigaction \
+        snprintf \
+        sqrt \
+        strcasecmp \
+        strcasestr \
+        strchr \
+        strstr \
+        strtol \
+        strtoul \
+        sync \
+        vsnprintf \
+])
 
 
 dnl Windows requires the mingw-catgets library for the catgets function.
@@ -86,68 +138,50 @@ 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' function.])
+        AC_MSG_RESULT([yes])
+], [
+        AC_MSG_RESULT([no])
+])
 
-
-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' function.])
-        AC_MSG_RESULT(yes)
-],
-[AC_MSG_RESULT(no)])
-
-
-AC_MSG_CHECKING(for clock_gettime)
-AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM(
-        [#include <time.h>],
-        [[
-        clock_gettime(CLOCK_MONOTONIC, 0);
-        return 0;
-        ]]
-    )],
-    [
-        AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define to 1 if you have the 'clock_gettime' function.])
-        AC_MSG_RESULT(yes)
+AC_MSG_CHECKING([for clock_gettime])
+AC_COMPILE_IFELSE([
+        AC_LANG_PROGRAM([#include <time.h>], [[
+                clock_gettime(CLOCK_MONOTONIC, 0);
+                return 0;
+        ]])
+], [
+        AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [Define to 1 if you have the 'clock_gettime' function.])
+        AC_MSG_RESULT([yes])
         # *bsd has clock_gettime() in libc
-        AC_CHECK_LIB(rt, clock_gettime, LIBS="-lrt $LIBS")
-    ],
-    [
-        AC_MSG_RESULT(no)
-    ]
-)
-
-AC_MSG_CHECKING(for mach_absolute_time)
-AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM(
-        [#include <mach/mach_time.h>],
-        [[
-        mach_absolute_time();
-        return 0;
-        ]]
-    )],
-    [
-        AC_DEFINE(HAVE_MACH_ABSOLUTE_TIME, 1, [Define to 1 if you have the 'mach_absolute_time' function.])
-        AC_MSG_RESULT(yes)
-        #AC_CHECK_LIB(, clock_gettime, LIBS="-lrt $LIBS")
-    ],
-    [
-        AC_MSG_RESULT(no)
-    ]
-)
-
-
+        AC_CHECK_LIB([rt], [clock_gettime], [LIBS="-lrt $LIBS"])
+], [
+        AC_MSG_RESULT([no])
+])
 
+AC_MSG_CHECKING([for mach_absolute_time])
+AC_COMPILE_IFELSE([
+        AC_LANG_PROGRAM([#include <mach/mach_time.h>], [[
+                mach_absolute_time();
+                return 0;
+        ]])
+], [
+        AC_DEFINE([HAVE_MACH_ABSOLUTE_TIME], [1], [Define to 1 if you have the 'mach_absolute_time' function.])
+        AC_MSG_RESULT([yes])
+        #AC_CHECK_LIB([], [clock_gettime], [LIBS="-lrt $LIBS"])
+], [
+        AC_MSG_RESULT([no])
+])
 
-AC_STRUCT_TM
 
 dnl ---------------
 dnl CHECK FOR ICONV
@@ -211,125 +245,174 @@ dnl Check if iconv uses const in prototype declaration
     fi
 fi
 
-AC_CHECK_LIB(nsl, t_open, LIBS="-lnsl $LIBS")
-AC_CHECK_LIB(socket, socket, LIBS="-lsocket $LIBS")
+dnl Check for networking libraries
+AC_CHECK_LIB([nsl], [t_open], [LIBS="-lnsl $LIBS"])
+AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket $LIBS"])
 
 dnl Check for X headers and libraries
 AC_PATH_X
 AC_PATH_XTRA
+AS_IF([test x$no_x = "xyes"], [
+        AC_MSG_ERROR([Fluxbox requires the X Window System libraries and headers.])
+])
 
-test x$no_x = "xyes" && AC_MSG_ERROR([Fluxbox requires the X Window System libraries and headers.])
-
-AS_IF(test "x$x_includes" = "x",[x_includes="/usr/include"])
-AS_IF(test "x$x_libraries" = "x",[x_libraries="/usr/lib"])
-
-CFLAGS="$CFLAGS $X_CFLAGS"
-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 LIBS="$X_LIBS $LIBS"
-LDFLAGS="$LDFLAGS $LIBS $X_PRE_LIBS"
 
 dnl Check for xpg4
-AC_CHECK_LIB(xpg4, setlocale, LIBS="-lxpg4 $LIBS")
-AC_CHECK_PROGS(gencat_cmd, gencat)
-AS_IF(test "x$gencat_cmd" = "x",[NLS=""],[])
-
-Xext_lib=""
+AC_CHECK_LIB([xpg4], [setlocale], [LIBS="-lxpg4 $LIBS"])
+AC_CHECK_PROGS([gencat_cmd], [gencat])
+AS_IF([test "x$gencat_cmd" = "x"], [NLS=""], [])
 
 dnl Check for Remember options
 AC_MSG_CHECKING([whether to include remember functionality])
-AC_ARG_ENABLE(remember,
-    AS_HELP_STRING([--enable-remember],[include Remembering attributes (default=yes)]),,[enable_remember=yes])
+AC_ARG_ENABLE([remember],
+        AS_HELP_STRING([--enable-remember],
+                [include Remembering attributes (default=yes)]),
+        [], [enable_remember=yes]
+)
 AC_MSG_RESULT([$enable_remember])
-AS_IF(test "x$enable_remember" = "xyes",[AC_DEFINE(REMEMBER, 1, " compile with remember")],[])
-AM_CONDITIONAL(REMEMBER_SRC, test "x$enable_remember" = "xyes")
+AS_IF([test "x$enable_remember" = "xyes"], [
+        AC_DEFINE([REMEMBER], [1], [compile with remember])
+])
+AM_CONDITIONAL([REMEMBER_SRC], [test "x$enable_remember" = "xyes"])
 
+dnl Check for regular expressions
 AC_MSG_CHECKING([whether to have (POSIX) regular expression support])
-AC_ARG_ENABLE(regexp,
-    AS_HELP_STRING([--enable-regexp],[regular expression support (default=yes)]),,[enable_regexp=yes])
-AS_IF(test "x$enable_regexp" = "xyes",[
-    AC_EGREP_HEADER([regex_t],regex.h,
-        AC_DEFINE(USE_REGEXP, 1, "Regular Expression support")
-        AC_MSG_RESULT([yes])
-        REGEXP_SRC=true,
-        AC_MSG_RESULT([no])
-        REGEXP_SRC=false
-    )],[])
-AM_CONDITIONAL(REGEXP_SRC, test x$REGEXP_SRC = xtrue)
+AC_ARG_ENABLE([regexp],
+        AS_HELP_STRING([--enable-regexp],
+                [regular expression support (default=yes)]),
+        [], [enable_regexp=yes]
+)
+AS_IF([test "x$enable_regexp" = "xyes"], [
+        AC_EGREP_HEADER([regex_t], [regex.h], [
+                AC_DEFINE([USE_REGEXP], [1], [Regular Expression support])
+                AC_MSG_RESULT([yes])
+                REGEXP_SRC=true
+        ], [
+                AC_MSG_RESULT([no])
+                REGEXP_SRC=false
+        ])
+])
+AM_CONDITIONAL([REGEXP_SRC], [test x$REGEXP_SRC = xtrue])
 
 dnl Check for the Slit
 AC_MSG_CHECKING([whether to include the Slit])
-AC_ARG_ENABLE(slit,
-    AS_HELP_STRING([--enable-slit],[include code for the Slit (default=yes)]),,[enable_slit=yes])
+AC_ARG_ENABLE([slit],
+        AS_HELP_STRING([--enable-slit],
+                [include code for the Slit (default=yes)]),
+        [], [enable_slit=yes]
+)
 AC_MSG_RESULT([$enable_slit])
-AS_IF(test "x$enable_slit" = "xyes",[AC_DEFINE(USE_SLIT, 1, " compile with slit")],[])
-AM_CONDITIONAL(SLIT_SRC, test "x$enable_slit" = "xyes")
+AS_IF([test "x$enable_slit" = "xyes"], [
+        AC_DEFINE([USE_SLIT], [1], [compile with slit])
+])
+AM_CONDITIONAL([SLIT_SRC], [test "x$enable_slit" = "xyes"])
 
 dnl Check for Systemtray options
 AC_MSG_CHECKING([whether to include SystemTray])
-AC_ARG_ENABLE(systray,
-    AS_HELP_STRING([--enable-systray],[include SystemTray (default=yes)]),,[enable_systray=yes])
+AC_ARG_ENABLE([systray],
+        AS_HELP_STRING([--enable-systray],
+                [include SystemTray (default=yes)]),
+        [], [enable_systray=yes]
+)
 AC_MSG_RESULT([$enable_systray])
-AS_IF(test "x$enable_systray" = "xyes",[AC_DEFINE(USE_SYSTRAY, 1, " compile with systemtray")],[])
-AM_CONDITIONAL(SYSTRAY_SRC, test "x$enable_systray" = "xyes")
+AS_IF([test "x$enable_systray" = "xyes"], [
+        AC_DEFINE([USE_SYSTRAY], [1], [compile with systemtray])
+])
+AM_CONDITIONAL([SYSTRAY_SRC], [test "x$enable_systray" = "xyes"])
 
 dnl Check for Toolbar options
 AC_MSG_CHECKING([whether to include Toolbaddr])
-AC_ARG_ENABLE(toolbar,
-    AS_HELP_STRING([--enable-toolbar],[include Toolbar (default=yes)]),,[enable_toolbar=yes])
+AC_ARG_ENABLE([toolbar],
+        AS_HELP_STRING([--enable-toolbar],
+                [include Toolbar (default=yes)]),
+        [], [enable_toolbar=yes]
+)
 AC_MSG_RESULT([$enable_toolbar])
-AS_IF(test "x$enable_systray" = "xyes" -a "x$enable_toolbar" != "xyes",[
-    AC_MSG_RESULT([disabled toolbar, but enabled systray => reenable toolbar])
-    AS_VAR_SET(enable_toolbar, "yes")],[])
-AS_IF(test "x$enable_toolbar" = "xyes",[AC_DEFINE(USE_TOOLBAR, 1, " compile with toolbar")],[])
-AM_CONDITIONAL(TOOLBAR_SRC, test "x$enable_toolbar" = "xyes")
 
+AS_IF([test "x$enable_systray" = "xyes" -a "x$enable_toolbar" != "xyes"], [
+        AC_MSG_RESULT([disabled toolbar, but enabled systray => reenable toolbar])
+        AS_VAR_SET([enable_toolbar], [yes])
+])
+AS_IF([test "x$enable_toolbar" = "xyes"], [
+        AC_DEFINE([USE_TOOLBAR], [1], [compile with toolbar])
+])
+AM_CONDITIONAL([TOOLBAR_SRC], [test "x$enable_toolbar" = "xyes"])
+
+dnl Extended Window Manager Hints
 AC_MSG_CHECKING([whether to support Extended Window Manager Hints])
-AC_ARG_ENABLE(ewmh,
-    AS_HELP_STRING([--enable-ewmh],[enable support for Extended Window Manager Hints (default=yes)]),,[enable_ewmh=yes])
+AC_ARG_ENABLE([ewmh],
+        AS_HELP_STRING([--enable-ewmh],
+                [enable support for Extended Window Manager Hints (default=yes)]),
+        [], [enable_ewmh=yes]
+)
 AC_MSG_RESULT([$enable_ewmh])
-AS_IF(test "x$enable_ewmh" = "xyes",[AC_DEFINE(USE_EWMH, 1, "use extened window manager hints")],[])
-AM_CONDITIONAL(EWMH, test "x$enable_ewmh" = "xyes")
+AS_IF([test "x$enable_ewmh" = "xyes"], [
+        AC_DEFINE([USE_EWMH], [1], [use extened window manager hints])
+])
+AM_CONDITIONAL([EWMH], [test "x$enable_ewmh" = "xyes"])
 
 dnl Check whether to include debugging code
 DEBUG=""
 AC_MSG_CHECKING([whether to include verbose debugging code])
-AC_ARG_ENABLE(debug,
-  AS_HELP_STRING([--enable-debug],[include verbose debugging code (default=no)]),,[enable_debug=no])
+AC_ARG_ENABLE([debug],
+        AS_HELP_STRING([--enable-debug],
+                [include verbose debugging code (default=no)]),
+        [], [enable_debug=no]
+)
 AC_MSG_RESULT([$enable_debug])
-AS_IF(test "x$enable_debug" = "xyes",[ DEBUG="-DDEBUG -Wall" ],[])
-AC_SUBST(DEBUG)
+AS_IF([test "x$enable_debug" = "xyes"], [DEBUG="-DDEBUG -Wall"])
+AC_SUBST([DEBUG])
 CXXFLAGS="$CXXFLAGS $DEBUG"
 
 dnl Check whether to build test programs
 AC_MSG_CHECKING([whether to build test programs])
-AC_ARG_ENABLE(test,
-    AS_HELP_STRING([--enable-test],[build programs used in testing fluxbox (default=no)]),,[enable_test=no])
+AC_ARG_ENABLE([test],
+        AS_HELP_STRING([--enable-test],
+                [build programs used in testing fluxbox (default=no)]),
+        [], [enable_test=no]
+)
 AC_MSG_RESULT([$enable_test])
-AM_CONDITIONAL(TEST, test "x$enable_test" = "xyes")
+AM_CONDITIONAL([TEST], [test "x$enable_test" = "xyes"])
 
 dnl Check whether to include native language support (i18n)
 AC_MSG_CHECKING([whether to include NLS support])
-AC_ARG_ENABLE(nls,
-    AS_HELP_STRING([--enable-nls],[include native language support (default=no)]),,[enable_nls=yes])
+AC_ARG_ENABLE([nls],
+        AS_HELP_STRING([--enable-nls],
+                [include native language support (default=no)]),
+        [], [enable_nls=yes]
+)
 AC_MSG_RESULT([$enable_nls])
-AS_IF(test "x$enable_nls" = "xyes",[
-    AC_DEFINE(NLS, 1, "Native language support")
-    NLS="-DNLS"],[])
-AC_SUBST(NLS)
+AS_IF([test "x$enable_nls" = "xyes"], [
+        AC_DEFINE([NLS], [1], [Native language support])
+        NLS="-DNLS"
+], [])
+AC_SUBST([NLS])
 
 dnl Check for new timed pixmap cache
 AC_MSG_CHECKING([whether to use a timed pixmap cache])
-AC_ARG_ENABLE(timedcache,
-    AS_HELP_STRING([--enable-timedcache],[use new timed pixmap cache (default=yes)]),,[enable_timedcache=yes])
+AC_ARG_ENABLE([timedcache],
+        AS_HELP_STRING([--enable-timedcache],
+                [use new timed pixmap cache (default=yes)]),
+        [], [enable_timedcache=yes]
+)
 AC_MSG_RESULT([$enable_timedcache])
-AS_IF(test "x$enable_timedcached" = "xyes",[
-    AC_DEFINE(TIMEDCACHE, 1, "timed cache")],[])
+AS_IF([test "x$enable_timedcached" = "xyes"], [
+        AC_DEFINE([TIMEDCACHE], [1], [timed cache])
+])
 
+dnl Check for UTF-8 support
 AC_MSG_CHECKING([whether to have XMB (multibyte font, utf-8) support])
-AC_ARG_ENABLE(xmb, AS_HELP_STRING([--enable-xmb],[XMB (multibyte font, utf-8) support (default=yes)]),,[enable_xmb=yes])
+AC_ARG_ENABLE([xmb],
+        AS_HELP_STRING([--enable-xmb],
+                [XMB (multibyte font, utf-8) support (default=yes)]),
+        [], [enable_xmb=yes]
+)
 AC_MSG_RESULT([$enable_xmb])
-AS_IF([test "x$enable_xmb" = "xyes"],[ AC_DEFINE(USE_XMB, 1, "multibyte support")], [])
-AM_CONDITIONAL(MULTIBYTE, test "x$enable_xmb" = "xyes")
+AS_IF([test "x$enable_xmb" = "xyes"], [
+        AC_DEFINE([USE_XMB], [1], [multibyte support])
+])
+AM_CONDITIONAL([MULTIBYTE], [test "x$enable_xmb" = "xyes"])
 
 dnl Check for imlib2
 have_imlib2=no
@@ -349,6 +432,7 @@ PKG_CHECK_MODULES([X11], [ x11 ],
         [have_x11=no])
 AM_CONDITIONAL([X11], [test "$have_x11" = "yes"], AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.]))
 
+dnl Check for X fonts
 have_xft=no
 AC_ARG_ENABLE([xft], AS_HELP_STRING([--disable-xft], [disable xft support]))
 AS_IF([test "x$enable_xft" != "xno"], [
@@ -367,6 +451,19 @@ AS_IF([test "$have_xft" = "yes"], [
         PKG_CHECK_MODULES([FONTCONFIG], [ fontconfig ], [], AC_MSG_ERROR([Could not find -lfontconfig.]))
 ])
 
+dnl Check for freetype
+have_freetype2=no
+AC_ARG_ENABLE([freetype2], AS_HELP_STRING([--disable-freetype2], [disable freetype2 support]))
+AS_IF([test "x$enable_freetype2" != "xno"], [
+        PKG_CHECK_MODULES([FREETYPE2], [ freetype2 ],
+                [AC_DEFINE([HAVE_FREETYPE2], [1], [Define if freetype2 is available]) have_freetype2=yes], [have_freetype2=no])
+        AS_IF([test "x$have_freetype2" = xno -a "x$enable_freetype2" = xyes], [
+                AC_MSG_ERROR([*** freetype2 support requested but libraries not found])
+        ])
+])
+AM_CONDITIONAL([FREETYPE2], [test "$have_freetype2" = "yes"])
+
+dnl Check for xrender
 have_xrender=no
 AC_ARG_ENABLE([xrender], AS_HELP_STRING([--disable-xrender], [disable xrender support]))
 AS_IF([test "x$enable_xrender" != "xno"], [
@@ -378,6 +475,7 @@ AS_IF([test "x$enable_xrender" != "xno"], [
 ])
 AM_CONDITIONAL([XRENDER], [test "$have_xrender" = "yes"])
 
+dnl Check for xpm
 have_xpm=no
 AC_ARG_ENABLE([xpm], AS_HELP_STRING([--disable-xpm], [disable xpm support]))
 AS_IF([test "x$enable_xpm" != "xno"], [
@@ -425,6 +523,7 @@ AS_IF([test "x$enable_xrandr" != "xno"], [
 ])
 AM_CONDITIONAL([RANDR], [test "$have_xrandr" = "yes"])
 
+dnl Check for fribidi
 have_fribidi=no
 AC_ARG_ENABLE([fribidi], AS_HELP_STRING([--disable-fribidi], [disable fribidi support]))
 AS_IF([test "x$enable_fribidi" != "xno"], [
@@ -436,91 +535,79 @@ AS_IF([test "x$enable_fribidi" != "xno"], [
 ])
 AM_CONDITIONAL([FRIBIDI], [test "$have_fribidi" = "yes"])
 
-have_freetype2=no
-AC_ARG_ENABLE([freetype2], AS_HELP_STRING([--disable-freetype2], [disable freetype2 support]))
-AS_IF([test "x$enable_freetype2" != "xno"], [
-        PKG_CHECK_MODULES([FREETYPE2], [ freetype2 ],
-                [AC_DEFINE([HAVE_FREETYPE2], [1], [Define if freetype2 is available]) have_freetype2=yes], [have_freetype2=no])
-        AS_IF([test "x$have_freetype2" = xno -a "x$enable_freetype2" = xyes], [
-                AC_MSG_ERROR([*** freetype2 support requested but libraries not found])
-        ])
-])
-AM_CONDITIONAL([FREETYPE2], [test "$have_freetype2" = "yes"])
-
-
-AC_ARG_WITH(menu,
-    AS_HELP_STRING([--with-menu=path],[location menu file (PREFIX/share/fluxbox/menu)]),
-    DEFAULT_MENU=$with_menu,
-    DEFAULT_MENU=\$\(prefix\)/share/fluxbox/menu
+dnl Various resource paths
+AC_ARG_WITH([menu],
+        AS_HELP_STRING([--with-menu=path], [location menu file (PREFIX/share/fluxbox/menu)]),
+        [default_menu="$withval"],
+        [default_menu="$prefix/share/fluxbox/menu"]
 )
-AC_SUBST(DEFAULT_MENU)
+AC_SUBST([DEFAULT_MENU], [$default_menu])
 
-AC_ARG_WITH(windowmenu,
-    AS_HELP_STRING([--with-windowmenu=path],[location windowmenu file (PREFIX/share/fluxbox/windowmenu)]),
-    DEFAULT_WINDOWMENU=$with_windowmenu,
-    DEFAULT_WINDOWMENU=\$\(prefix\)/share/fluxbox/windowmenu
+AC_ARG_WITH([windowmenu],
+        AS_HELP_STRING([--with-windowmenu=path], [location windowmenu file (PREFIX/share/fluxbox/windowmenu)]),
+        [default_windowmenu="$withval"],
+        [default_windowmenu="$prefix/share/fluxbox/windowmenu"]
 )
-AC_SUBST(DEFAULT_WINDOWMENU)
+AC_SUBST([DEFAULT_WINDOWMENU], [$default_windowmenu])
 
-AC_ARG_WITH(style,
-  AS_HELP_STRING([--with-style=path],[style by default (PREFIX/share/fluxbox/styles/bloe)]),
-  DEFAULT_STYLE=$with_style,
-  DEFAULT_STYLE=\$\(prefix\)/share/fluxbox/styles/bloe
+AC_ARG_WITH([style],
+        AS_HELP_STRING([--with-style=path], [style by default (PREFIX/share/fluxbox/styles/bloe)]),
+        [default_style="$withval"],
+        [default_style="$prefix/share/fluxbox/styles/bloe"]
 )
-AC_SUBST(DEFAULT_STYLE)
+AC_SUBST([DEFAULT_STYLE], [$default_style])
 
-AC_ARG_WITH(keys,
-  AS_HELP_STRING([--with-keys=path],[location keys file (PREFIX/share/fluxbox/keys)]),
-  DEFAULT_KEYS=$with_keys,
-  DEFAULT_KEYS=\$\(prefix\)/share/fluxbox/keys
+AC_ARG_WITH([keys],
+        AS_HELP_STRING([--with-keys=path], [location keys file (PREFIX/share/fluxbox/keys)]),
+        [default_keys="$withval"],
+        [default_keys="$prefix/share/fluxbox/keys"]
 )
-AC_SUBST(DEFAULT_KEYS)
+AC_SUBST([DEFAULT_KEYS], [$default_keys])
 
-AC_ARG_WITH(apps,
-  AS_HELP_STRING([--with-apps=path],[location apps file (PREFIX/share/fluxbox/apps)]),
-  DEFAULT_APPS=$with_apps,
-  DEFAULT_APPS=\$\(prefix\)/share/fluxbox/apps
+AC_ARG_WITH([apps],
+        AS_HELP_STRING([--with-apps=path], [location apps file (PREFIX/share/fluxbox/apps)]),
+        [default_apps="$withval"],
+        [default_apps="$prefix/share/fluxbox/apps"]
 )
-AC_SUBST(DEFAULT_APPS)
+AC_SUBST([DEFAULT_APPS], [$default_apps])
 
-AC_ARG_WITH(overlay,
-  AS_HELP_STRING([--with-overlay=path],[location overlay file (PREFIX/share/fluxbox/overlay)]),
-  DEFAULT_OVERLAY=$with_overlay,
-  DEFAULT_OVERLAY=\$\(prefix\)/share/fluxbox/overlay
+AC_ARG_WITH([overlay],
+        AS_HELP_STRING([--with-overlay=path], [location overlay file (PREFIX/share/fluxbox/overlay)]),
+        [default_overlay="$withval"],
+        [default_overlay="$prefix/share/fluxbox/overlay"]
 )
-AC_SUBST(DEFAULT_OVERLAY)
+AC_SUBST([DEFAULT_OVERLAY], [$default_overlay])
 
-AC_ARG_WITH(init,
-  AS_HELP_STRING([--with-init=path],[location init file (PREFIX/share/fluxbox/init)]),
-  DEFAULT_INIT=$with_init,
-  DEFAULT_INIT=\$\(prefix\)/share/fluxbox/init
+AC_ARG_WITH([init],
+        AS_HELP_STRING([--with-init=path], [location init file (PREFIX/share/fluxbox/init)]),
+        [default_init="$withval"],
+        [default_init="$prefix/share/fluxbox/init"]
 )
-AC_SUBST(DEFAULT_INIT)
-
-# we have to expand locale_path in the config.h file, but NOT in the makefiles!
-AC_ARG_WITH(locale,
-  AS_HELP_STRING([--with-locale=path],[location for nls files (PREFIX/share/fluxbox/nls)]),
-  LOCALE_PATH=$with_locale
-  AC_DEFINE_UNQUOTED(LOCALEPATH, "$LOCALE_PATH", "location for nls files")
-  ,
-  LOCALE_PATH=\$\(prefix\)/share/fluxbox/nls
-  AC_DEFINE_UNQUOTED(LOCALEPATH, "$prefix/share/fluxbox/nls", "location for nls files")
-)
-AC_SUBST(LOCALE_PATH)
+AC_SUBST([DEFAULT_INIT], [$default_init])
+
+dnl we have to expand locale_path in the config.h file, but NOT in the
+dnl makefiles!
+AC_ARG_WITH([locale],
+        AS_HELP_STRING([--with-locale=path], [location for nls files (PREFIX/share/fluxbox/nls)]), [
+        locale_path="$withval"
+        AC_DEFINE_UNQUOTED([LOCALEPATH], ["$locale_path"], [location for nls files])
+], [
+        locale_path="$prefix/share/fluxbox/nls"
+        AC_DEFINE_UNQUOTED([LOCALEPATH], ["$prefix/share/fluxbox/nls"], [location for nls files])
+])
+AC_SUBST([LOCALE_PATH], [$locale_path])
 
-AC_SUBST(program_prefix)
-AC_SUBST(program_suffix)
+AC_SUBST([program_prefix])
+AC_SUBST([program_suffix])
 
 dnl Determine the return type of signal handlers
 AC_TYPE_SIGNAL
 
-dnl Determine if maintainer portions of the Makefiles should be included.
-dnl AM_MAINTAINER_MODE
-
 dnl Output files
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 
-AC_OUTPUT(Makefile
+AC_OUTPUT([
+Makefile
 version.h
 src/Makefile
 src/FbTk/Makefile
@@ -586,7 +673,7 @@ nls/uk_UA/Makefile
 nls/vi_VN/Makefile
 nls/zh_CN/Makefile
 nls/zh_TW/Makefile
-)
+])
 
 dnl Print results
 AC_MSG_RESULT([])
@@ -594,11 +681,12 @@ AC_MSG_RESULT([	$PACKAGE version $VERSION configured successfully.])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([Using:])
 AC_MSG_RESULT([ '$prefix' for installation.])
-AC_MSG_RESULT([ '$DEFAULT_MENU' for location menu file.])
-AC_MSG_RESULT([ '$DEFAULT_STYLE' by default style.])
-AC_MSG_RESULT([ '$DEFAULT_KEYS' for location keys file.])
-AC_MSG_RESULT([ '$DEFAULT_INIT' for location init file.])
-AC_MSG_RESULT([ '$LOCALE_PATH' for nls files.])
+AC_MSG_RESULT([ '$default_menu' for location menu file.])
+AC_MSG_RESULT([ '$default_windowmenu' for location window menu file.])
+AC_MSG_RESULT([ '$default_style' by default style.])
+AC_MSG_RESULT([ '$default_keys' for location keys file.])
+AC_MSG_RESULT([ '$default_init' for location init file.])
+AC_MSG_RESULT([ '$locale_path' for nls files.])
 AC_MSG_RESULT([ '$CXX' for C++ compiler.])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([Building with:])