@@ -3,21 +3,23 @@ *.o
 
 # Exact filename in any subdir.
 .deps
+.dirstamp
 Makefile
 Makefile.in
 
 # Exact wildcard, e.g., not in subdirs.
-/*.m4
 /doc/*.1
 /doc/*.5
 /doc/*/*.1
 /doc/*/*.5
 /nls/*/*.cat
 /nls/*/generated-*.m
+/m4/*.m4
 
 # Exact match, if a directory then everything in directory.
 /aclocal.m4
 /autom4te.cache/
+/build-aux/
 /config.h
 /config.h.in
 /config.log
@@ -26,19 +28,23 @@ /configure
 /data/apps
 /data/init
 /data/menu
-/depcomp
-/install-sh
-/ltmain.sh
-/missing
-/src/FbTk/libFbTk.a
+/fbrun
+/fbsetroot
+/fluxbox
+/fluxbox-remote
+/fluxbox-update_configs
+/libFbTk.a
 /src/defaults.cc
 /src/defaults.hh
-/src/fluxbox
 /stamp-h1
-/util/fbrun/fbrun
-/util/fbsetroot
+/testDemandAttention
+/testFont
+/testFullscreen
+/testKeys
+/testRectangleUtil
+/testSignals
+/testStringUtil
+/testTexture
 /util/fluxbox-generate_menu
-/util/fluxbox-remote
-/util/fluxbox-update_configs
 /util/startfluxbox
 /version.h

@@ -1,477 +1,852 @@ 
-# Doxyfile 1.3.4
+# Doxyfile 1.8.3.1
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a hash (#) is considered a comment and will be ignored.
 # The format is:
 #       TAG = value [value, ...]
 # For lists items can also be appended using:
 #       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# Values that contain spaces should be placed between quotes (" ").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
 
 PROJECT_NAME           = fluxbox
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
 PROJECT_NUMBER         = 1.3.1
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = doc/
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
-# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese, 
-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
 
-OUTPUT_LANGUAGE        = English
+CREATE_SUBDIRS         = NO
 
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
-# all platforms other than Windows).
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
 
-USE_WINDOWS_ENCODING   = NO
+OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
 # Set to NO to disable this.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
 
 REPEAT_BRIEF           = YES
 
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
 # description.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
-# members of a class in the documentation of that class as if those members were 
-# ordinary class members. Constructors, destructors and assignment operators of 
-# the base classes will not be shown.
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
 # to NO the shortest path that makes the file name unique will be used.
 
 FULL_PATH_NAMES        = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. It is allowed to use relative paths in the argument list.
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip. Note that you specify absolute paths here, but also
+# relative paths, which will be relative from the directory where doxygen is
+# started.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
 # doesn't support long names like on DOS, Mac, or CD-ROM.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explict @brief command for a brief description.
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
 
-MULTILINE_CPP_IS_BRIEF = NO
+QT_AUTOBRIEF           = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
 
-DETAILS_AT_TOP         = NO
+MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# reimplements.
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
 
 INHERIT_DOCS           = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
 
-DISTRIBUTE_GROUP_DOC   = NO
+SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
 TAB_SIZE               = 4
 
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
 # You can put \n's in the value part of an alias to insert newlines.
 
-ALIASES                = 
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST              =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
-# only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
-# will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension,
+# and language is one of the parsers supported by doxygen: IDL, Java,
+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
+# C++. For instance to make doxygen treat .inc files as Fortran files (default
+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
+# that for custom extensions you also need to set FILE_PATTERNS otherwise the
+# files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented classes,
+# or namespaces to their corresponding documentation. Such a link can be
+# prevented in individual cases by by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also makes the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES (the
+# default) will make doxygen replace the get and set methods by a property in
+# the documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
 # the \nosubgrouping command.
 
 SUBGROUPING            = YES
 
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields will be shown inline in the documentation
+# of the scope in which they are defined (i.e. file, namespace, or group
+# documentation), provided this scope is documented. If set to NO (the default),
+# structs, classes, and unions are shown on a separate page (for HTML and Man
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+SYMBOL_CACHE_SIZE      = 0
+
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
+# their name and scope. Since this can be an expensive process and often the
+# same symbol appear multiple times in the code, doxygen keeps a cache of
+# pre-resolved symbols. If the cache is too small doxygen will become slower.
+# If the cache is too large, memory is wasted. The cache size is given by this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE      = 0
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 
 EXTRACT_ALL            = NO
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
 # will be included in the documentation.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
 EXTRACT_STATIC         = NO
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
 # If set to NO only classes defined in header files are included.
 
 EXTRACT_LOCAL_CLASSES  = YES
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
 # This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
 # overviews. This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
 # documentation.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
 # function's detailed documentation block.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
 # Set it to YES to include the internal documentation.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# users are advised to set this option to NO.
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
 # documentation. If set to YES the scope will be hidden.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
 # of that file.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
 # is inserted in the documentation for inline members.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
 # declaration order.
 
 SORT_MEMBER_DOCS       = YES
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
 # commands in the documentation.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
 # commands in the documentation.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
 # \deprecated commands in the documentation.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if section-label ... \endif
+# and \cond section-label ... \endcond blocks.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or macro consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and macros in the
+# documentation can be controlled using \showinitializer or \hideinitializer
 # command in the documentation regardless of this setting.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
 # list will mention the files that were used to generate the documentation.
 
 SHOW_USED_FILES        = YES
 
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path. Do not use
+# file names with spaces, bibtex cannot handle them.
+
+CITE_BIB_FILES         =
+
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated 
+# The QUIET tag can be used to turn on/off the messages that are generated
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
 QUIET                  = NO
 
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
 # NO is used.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
 # automatically be disabled.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
 # don't exist or using markup commands wrongly.
 
 WARN_IF_DOC_ERROR      = YES
 
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text.
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
 INPUT                  = src/ \
                          src/FbTk/
 
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
 
 FILE_PATTERNS          = *.hh \
                          *.cc
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
 # If left blank NO is used.
 
 RECURSIVE              = NO
 
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
 
-EXCLUDE                = 
+EXCLUDE                =
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories.
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = ~*
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH           = 
+EXAMPLE_PATH           =
 
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.
 
-EXAMPLE_PATTERNS       = 
+EXAMPLE_PATTERNS       =
 
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH             = 
+IMAGE_PATH             =
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
 # to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
 
-INPUT_FILTER           = 
+INPUT_FILTER           =
 
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
 
 FILTER_SOURCE_FILES    = NO
 
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page (index.html).
+# This can be useful if you have a project on for instance GitHub and want reuse
+# the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
 # be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
 
 SOURCE_BROWSER         = YES
 
-# Setting the INLINE_SOURCES tag to YES will include the body 
+# Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
 
 INLINE_SOURCES         = YES
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C, C++ and Fortran comments will always remain visible.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
-# then for each documented function all documented 
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES (the default) 
-# then for each documented function all documented entities 
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = YES
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
 # which an include is specified. Set to NO to disable this.
 
 VERBATIM_HEADERS       = YES
@@ -480,277 +855,604 @@ #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
 # contains a lot of classes, structs, unions or interfaces.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])
 
 COLS_IN_ALPHA_INDEX    = 5
 
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
 # should be ignored while generating the index headers.
 
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
 # generate HTML output.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
 HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
 # doxygen will generate files with .html extension.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header. Note that when using a custom header you are responsible
+#  for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
 
-HTML_HEADER            = 
+HTML_HEADER            =
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
-HTML_FOOTER            = 
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If left blank doxygen will
+# generate a default style sheet. Note that it is recommended to use
+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
+# tag will in the future become obsolete.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
+# user-defined cascading style sheet that is included after the standard
+# style sheets created by doxygen. Using this option one can overrule
+# certain style aspects. This is preferred over using HTML_STYLESHEET
+# since it does not replace the standard style sheet and is therefor more
+# robust against future updates. Doxygen will copy the style sheet file to
+# the output directory.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet
+DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-HTML_STYLESHEET        = 
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
+DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-HTML_ALIGN_MEMBERS     = YES
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
+# identify the documentation publisher. This should be a reverse domain-name
+# style string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output dir.
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
 
-CHM_FILE               = 
+CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
 # the HTML help compiler on the generated index.hhp.
 
-HHC_LOCATION           = 
+HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
 # it should be included in the master .chm file (NO).
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
 # normal table of contents (NO) in the .chm file.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
 # to the contents of the HTML help documentation and to the tree view.
 
 TOC_EXPAND             = NO
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+#  will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
 
 DISABLE_INDEX          = NO
 
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
 
-ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
 
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
 
-GENERATE_TREEVIEW      = NO
+ENUM_VALUES_PER_LINE   = 4
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
 # is shown.
 
 TREEVIEW_WIDTH         = 250
 
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
+# SVG. The default value is HTML-CSS, which is slower, but has the best
+# compatibility.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS     =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript.
+# There are two flavours of web server based search depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools.
+# See the manual for details.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain
+# the search results. Doxygen ships with an example indexer (doxyindexer) and
+# search engine (doxysearch.cgi) which are based on the open source search engine
+# library Xapian. See the manual for configuration details.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will returned the search results when EXTERNAL_SEARCH is enabled.
+# Doxygen ships with an example search engine (doxysearch) which is based on
+# the open source search engine library Xapian. See the manual for configuration
+# details.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
+# of to a relative location where the documentation can be found.
+# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
+
+EXTRA_SEARCH_MAPPINGS  =
+
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `latex' will be used as the default path.
 
 LATEX_OUTPUT           = latex
 
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
 # default command name.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, letter, legal and
 # executive. If left blank a4wide will be used.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
 # packages that should be included in the LaTeX output.
 
-EXTRA_PACKAGES         = 
+EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
 # standard header. Notice: only use this tag if you know what you are doing!
 
-LATEX_HEADER           = 
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
+LATEX_FOOTER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
 # This makes the output suitable for online browsing using a pdf viewer.
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
 # higher quality PDF documentation.
 
 USE_PDFLATEX           = NO
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
 # This option is also used when generating formulas in HTML.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
 # in the output.
 
 LATEX_HIDE_INDICES     = NO
 
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE        = plain
+
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimised for Word 97 and may not look very pretty with 
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
 # other RTF readers or editors.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `rtf' will be used as the default path.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
 # Note: wordpad (write) and others do not support links.
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assigments. You only have to provide 
+# Load style sheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
 # replacements, missing definitions are set to their default value.
 
-RTF_STYLESHEET_FILE    = 
+RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document. 
+# Set optional variables used in the generation of an rtf document.
 # Syntax is similar to doxygen's config file.
 
-RTF_EXTENSIONS_FILE    = 
+RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `man' will be used as the default path.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to 
+# The MAN_EXTENSION tag determines the extension that is added to
 # the generated man pages (default is the subroutine's section .3)
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
 # would be unable to find the correct page. The default is NO.
 
 MAN_LINKS              = NO
@@ -759,40 +1461,45 @@ #---------------------------------------------------------------------------
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `xml' will be used as the default path.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
-XML_SCHEMA             = 
+XML_SCHEMA             =
 
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
-XML_DTD                = 
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
 
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
 # and incomplete at the moment.
 
 GENERATE_AUTOGEN_DEF   = NO
@@ -801,280 +1508,364 @@ #---------------------------------------------------------------------------
 # configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
 # moment.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
 # to generate PDF and DVI output from the Perl module output.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
 # and Perl will parse it just the same.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
 # Makefile don't overwrite each other's variables.
 
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
 # files.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
 MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
 
 SEARCH_INCLUDES        = YES
 
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
 # the preprocessor.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
 
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
 # be used.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed.
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
 
-PREDEFINED             = 
+PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse the 
-# parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
+# Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
 
-TAGFILES               = 
+TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
 # will be listed.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
 # be listed.
 
 EXTERNAL_GROUPS        = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script 
+# The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
 PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
-# super classes. Setting the tag to NO turns the diagrams off. Note that this 
-# option is superceded by the HAVE_DOT option below. This is only a fallback. It is 
-# recommended to install and use dot, since it yields more powerful graphs.
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
 
 CLASS_DIAGRAMS         = YES
 
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
 # or is not a class.
 
 HIDE_UNDOC_RELATIONS   = YES
 
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
 # have no effect if this option is set to NO (the default)
 
 HAVE_DOT               = NO
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# CLASS_DIAGRAMS tag to NO.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
 # class references variables) of the class with other documented classes.
 
 COLLABORATION_GRAPH    = YES
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similiar to the OMG's Unified Modeling 
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 
 UML_LOOK               = NO
 
-# If set to YES, the inheritance and collaboration graphs will show the 
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If set to YES, the inheritance and collaboration graphs will show the
 # relations between templates and their instances.
 
 TEMPLATE_RELATIONS     = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
 # other documented files.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
 # indirectly include this file.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
-# generate a call dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable call graphs for selected 
-# functions only using the \callgraph command.
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will generate a graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
 
 DOT_IMAGE_FORMAT       = png
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found on the path.
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG        = NO
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
 
-DOT_PATH               = 
+DOT_PATH               =
 
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
 # \dotfile command).
 
-DOTFILE_DIRS           = 
+DOTFILE_DIRS           =
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
 
-MAX_DOT_GRAPH_WIDTH    = 1024
+MSCFILE_DIRS           =
 
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
-MAX_DOT_GRAPH_HEIGHT   = 1024
+DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes that 
-# lay further from the root node will be omitted. Note that setting this option to 
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
-# note that a graph may be further truncated if the graph's image dimensions are 
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
 # arrows in the dot generated graphs.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
 # the various graphs.
 
 DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO

@@ -1,17 +1,82 @@ 
 # Makefile.am for Fluxbox - http://fluxbox.org
 
-# data dir after util so that utils are built for path searching
-# when generating menu
+ACLOCAL_AMFLAGS = -I m4
+AM_CPPFLAGS = \
+	-include $(top_builddir)/config.h
+
+# the defaults.hh is wrote to builddir
+src_incdir = $(top_srcdir)/src -I$(top_builddir)/src
+fbtk_incdir = $(top_srcdir)/src/FbTk
+nls_incdir = $(top_srcdir)/nls
+
+EXTRA_DIST = \
+	3rd/vim/ \
+	build-aux/config.rpath \
+	nls/fluxbox-nls.hh \
+	nls/nlsinfo
+
+CLEANFILES =
+bin_PROGRAMS =
+
+MAINTAINERCLEANFILES = \
+	aclocal.m4 \
+	config.h.in \
+	configure \
+	Makefile.in \
+	stamp-h.in
+
+DEFAULT_MENU=@DEFAULT_MENU@
+DEFAULT_STYLE=@DEFAULT_STYLE@
+DEFAULT_KEYSFILE=@DEFAULT_KEYS@
+DEFAULT_APPSFILE=@DEFAULT_APPS@
+DEFAULT_OVERLAY=@DEFAULT_OVERLAY@
+DEFAULT_INITFILE=@DEFAULT_INIT@
+DEFAULT_WINDOWMENU=@DEFAULT_WINDOWMENU@
+PROGRAM_PREFIX=@program_prefix@
+PROGRAM_SUFFIX=@program_suffix@
+
+# Do not rely on configure.ac AC_CONFIG_FILES for install paths.  The
+# paths should be expanded at make time rather than configure.
+edit_cmd = sed \
+	 -e 's|@bindir[@]|$(bindir)|g' \
+	 -e 's|@datadir[@]|$(datadir)|g' \
+	 -e 's|@exec_prefix[@]|$(exec_prefix)|g' \
+	 -e 's|@includedir[@]|$(includedir)|g' \
+	 -e 's|@localstatedir[@]|$(localstatedir)|g' \
+	 -e 's|@pkgbindir[@]|$(pkgbindir)|g' \
+	 -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
+	 -e 's|@pkgprefix[@]|$(pkgprefix:NONE=)|g' \
+	 -e 's|@pkgsuffix[@]|$(pkgsuffix:NONE=)|g' \
+	 -e 's|@prefix[@]|$(prefix)|g' \
+	 -e 's|@sbindir[@]|$(sbindir)|g' \
+	 -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	 -e 's|@usrbin_execdir[@]|$(usrbin_execdir)|g' \
+	 -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \
+	 -e 's|@usrsbin_execdir[@]|$(usrsbin_execdir)|g' \
+	 -e 's|@VERSION[@]|$(VERSION)|g'
 
-SUBDIRS = doc nls src util data
-MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
-ACLOCAL_AMFLAGS = -I .
-EXTRA_DIST = acinclude.m4 $(top_srcdir)/3rd/vim/* $(top_srcdir)/3rd/vim/syntax/*
+PATHFILES =
+CLEANFILES += $(PATHFILES)
+EXTRA_DIST += $(PATHFILES:=.in)
+
+$(PATHFILES): Makefile
+	@ rm -f $@ $@.tmp
+	$(AM_V_GEN) srcdir=''; \
+		test -f ./$@.in || srcdir=$(srcdir)/; \
+		$(edit_cmd) $${srcdir}$@.in >$@.tmp
+	@ mv $@.tmp $@
+
+include data/Makemodule.am
+include doc/Makemodule.am
+include nls/Makemodule.am
+include src/FbTk/Makemodule.am
+include src/Makemodule.am
+include src/tests/Makemodule.am
+include util/Makemodule.am
+include util/fbrun/Makemodule.am
 
 uninstall-hook:
 	rmdir $(DESTDIR)$(pkgdatadir)
-distclean-local:
-	rm -f *\~
 
 source-doc:
 	doxygen Doxyfile

@@ -1,231 +0,0 @@ 
-dnl @synopsis AC_PATH_GENERIC(LIBRARY [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl
-dnl Runs a LIBRARY-config script and defines LIBRARY_CFLAGS and LIBRARY_LIBS
-dnl
-dnl The script must support `--cflags' and `--libs' args.
-dnl If MINIMUM-VERSION is specified, the script must also support the
-dnl `--version' arg.
-dnl If the `--with-library-[exec-]prefix' arguments to ./configure are given,
-dnl it must also support `--prefix' and `--exec-prefix'.
-dnl (In other words, it must be like gtk-config.)
-dnl
-dnl For example:
-dnl
-dnl    AC_PATH_GENERIC(Foo, 1.0.0)
-dnl
-dnl would run `foo-config --version' and check that it is at least 1.0.0
-dnl
-dnl If so, the following would then be defined:
-dnl
-dnl    FOO_CFLAGS to `foo-config --cflags`
-dnl    FOO_LIBS   to `foo-config --libs`
-dnl
-dnl At present there is no support for additional "MODULES" (see AM_PATH_GTK)
-dnl (shamelessly stolen from gtk.m4 and then hacked around a fair amount)
-dnl
-dnl @author Angus Lees <gusl@cse.unsw.edu.au>
-dnl @version $Id: ac_path_generic.m4,v 1.1.1.1 2001/07/26 00:46:28 guidod Exp $
-
-AC_DEFUN([AC_PATH_GENERIC],
-[dnl
-dnl we're going to need uppercase, lowercase and user-friendly versions of the
-dnl string `LIBRARY'
-pushdef([UP], translit([$1], [a-z], [A-Z]))dnl
-pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl
-
-dnl
-dnl Get the cflags and libraries from the LIBRARY-config script
-dnl
-AC_ARG_WITH(DOWN-prefix,[  --with-]DOWN[-prefix=PFX       Prefix where $1 is installed (optional)],
-        DOWN[]_config_prefix="$withval", DOWN[]_config_prefix="")
-AC_ARG_WITH(DOWN-exec-prefix,[  --with-]DOWN[-exec-prefix=PFX Exec prefix where $1 is installed (optional)],
-        DOWN[]_config_exec_prefix="$withval", DOWN[]_config_exec_prefix="")
-
-  if test x$DOWN[]_config_exec_prefix != x ; then
-     DOWN[]_config_args="$DOWN[]_config_args --exec-prefix=$DOWN[]_config_exec_prefix"
-     if test x${UP[]_CONFIG+set} != xset ; then
-       UP[]_CONFIG=$DOWN[]_config_exec_prefix/bin/DOWN-config
-     fi
-  fi
-  if test x$DOWN[]_config_prefix != x ; then
-     DOWN[]_config_args="$DOWN[]_config_args --prefix=$DOWN[]_config_prefix"
-     if test x${UP[]_CONFIG+set} != xset ; then
-       UP[]_CONFIG=$DOWN[]_config_prefix/bin/DOWN-config
-     fi
-  fi
-
-  AC_PATH_PROG(UP[]_CONFIG, DOWN-config, no)
-  ifelse([$2], ,
-     AC_MSG_CHECKING(for $1),
-     AC_MSG_CHECKING(for $1 - version >= $2)
-  )
-  no_[]DOWN=""
-  if test "$UP[]_CONFIG" = "no" ; then
-     no_[]DOWN=yes
-  else
-     UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args --cflags`"
-     UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args --libs`"
-     ifelse([$2], , ,[
-        DOWN[]_config_major_version=`$UP[]_CONFIG $DOWN[]_config_args \
-         --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-        DOWN[]_config_minor_version=`$UP[]_CONFIG $DOWN[]_config_args \
-         --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-        DOWN[]_config_micro_version=`$UP[]_CONFIG $DOWN[]_config_args \
-         --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-        DOWN[]_wanted_major_version="regexp($2, [\<\([0-9]*\)], [\1])"
-        DOWN[]_wanted_minor_version="regexp($2, [\<\([0-9]*\)\.\([0-9]*\)], [\2])"
-        DOWN[]_wanted_micro_version="regexp($2, [\<\([0-9]*\).\([0-9]*\).\([0-9]*\)], [\3])"
-
-        # Compare wanted version to what config script returned.
-        # If I knew what library was being run, i'd probably also compile
-        # a test program at this point (which also extracted and tested
-        # the version in some library-specific way)
-        if test "$DOWN[]_config_major_version" -lt \
-                        "$DOWN[]_wanted_major_version" \
-          -o \( "$DOWN[]_config_major_version" -eq \
-                        "$DOWN[]_wanted_major_version" \
-            -a "$DOWN[]_config_minor_version" -lt \
-                        "$DOWN[]_wanted_minor_version" \) \
-          -o \( "$DOWN[]_config_major_version" -eq \
-                        "$DOWN[]_wanted_major_version" \
-            -a "$DOWN[]_config_minor_version" -eq \
-                        "$DOWN[]_wanted_minor_version" \
-            -a "$DOWN[]_config_micro_version" -lt \
-                        "$DOWN[]_wanted_micro_version" \) ; then
-          # older version found
-          no_[]DOWN=yes
-          echo -n "*** An old version of $1 "
-          echo -n "($DOWN[]_config_major_version"
-          echo -n ".$DOWN[]_config_minor_version"
-          echo    ".$DOWN[]_config_micro_version) was found."
-          echo -n "*** You need a version of $1 newer than "
-          echo -n "$DOWN[]_wanted_major_version"
-          echo -n ".$DOWN[]_wanted_minor_version"
-          echo    ".$DOWN[]_wanted_micro_version."
-          echo "***"
-          echo "*** If you have already installed a sufficiently new version, this error"
-          echo "*** probably means that the wrong copy of the DOWN-config shell script is"
-          echo "*** being found. The easiest way to fix this is to remove the old version"
-          echo "*** of $1, but you can also set the UP[]_CONFIG environment to point to the"
-          echo "*** correct copy of DOWN-config. (In this case, you will have to"
-          echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf"
-          echo "*** so that the correct libraries are found at run-time)"
-        fi
-     ])
-  fi
-  if test "x$no_[]DOWN" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$3], , :, [$3])
-  else
-     AC_MSG_RESULT(no)
-     if test "$UP[]_CONFIG" = "no" ; then
-       echo "*** The DOWN-config script installed by $1 could not be found"
-       echo "*** If $1 was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the UP[]_CONFIG environment variable to the"
-       echo "*** full path to DOWN-config."
-     fi
-     UP[]_CFLAGS=""
-     UP[]_LIBS=""
-     ifelse([$4], , :, [$4])
-  fi
-  AC_SUBST(UP[]_CFLAGS)
-  AC_SUBST(UP[]_LIBS)
-
-  popdef([UP])
-  popdef([DOWN])
-])
-# 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 fontconfig`
-        XFT_LIBS=`$PKG_CONFIG $xftconf_args --libs xft fontconfig`
-        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="$XFT_LIBS $LIBS"
-])

@@ -14,7 +14,7 @@ }
 
 libtoolize --copy --force --automake
 rm -f config.cache
-dothis aclocal -I . ${ACLOCAL_FLAGS}
+dothis aclocal -I m4 ${ACLOCAL_FLAGS}
 dothis autoheader
 dothis automake -a -c
 dothis autoconf

@@ -0,0 +1,690 @@ 
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2012 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's _LT_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+        ecc*)
+          wl='-Wl,'
+          ;;
+        icc* | ifort*)
+          wl='-Wl,'
+          ;;
+        lf95*)
+          wl='-Wl,'
+          ;;
+        nagfor*)
+          wl='-Wl,-Wl,,'
+          ;;
+        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        xl* | bgxl* | bgf* | mpixl*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ F* | *Sun*Fortran*)
+              wl=
+              ;;
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+    newsos6)
+      ;;
+    *nto* | *qnx*)
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    rdos*)
+      ;;
+    solaris*)
+      case $cc_basename in
+        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+          wl='-Qoption ld '
+          ;;
+        *)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      wl='-Wl,'
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  case "$host_os" in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    haiku*)
+      ;;
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+          ;;
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            :
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+          ;;
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct=no
+            ;;
+          *)
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    *nto* | *qnx*)
+      ;;
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        else
+          case "$host_os" in
+            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+              hardcode_libdir_flag_spec='-R$libdir'
+              ;;
+            *)
+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+              ;;
+          esac
+        fi
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec=      # the last element of library_names_spec in libtool.m4
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    library_names_spec='$libname.a'
+    ;;
+  aix[4-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  amigaos*)
+    case "$host_cpu" in
+      powerpc*)
+        library_names_spec='$libname$shrext' ;;
+      m68k)
+        library_names_spec='$libname.a' ;;
+    esac
+    ;;
+  beos*)
+    library_names_spec='$libname$shrext'
+    ;;
+  bsdi[45]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  cygwin* | mingw* | pw32* | cegcc*)
+    shrext=.dll
+    library_names_spec='$libname.dll.a $libname.lib'
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    library_names_spec='$libname$shrext'
+    ;;
+  dgux*)
+    library_names_spec='$libname$shrext'
+    ;;
+  freebsd* | dragonfly*)
+    case "$host_os" in
+      freebsd[123]*)
+        library_names_spec='$libname$shrext$versuffix' ;;
+      *)
+        library_names_spec='$libname$shrext' ;;
+    esac
+    ;;
+  gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  haiku*)
+    library_names_spec='$libname$shrext'
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    library_names_spec='$libname$shrext'
+    ;;
+  interix[3-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  irix5* | irix6* | nonstopux*)
+    library_names_spec='$libname$shrext'
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  knetbsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  netbsd*)
+    library_names_spec='$libname$shrext'
+    ;;
+  newsos6)
+    library_names_spec='$libname$shrext'
+    ;;
+  *nto* | *qnx*)
+    library_names_spec='$libname$shrext'
+    ;;
+  openbsd*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    library_names_spec='$libname.a'
+    ;;
+  osf3* | osf4* | osf5*)
+    library_names_spec='$libname$shrext'
+    ;;
+  rdos*)
+    ;;
+  solaris*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sunos4*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  sysv4 | sysv4.3*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv4*MP*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  tpf*)
+    library_names_spec='$libname$shrext'
+    ;;
+  uts4*)
+    library_names_spec='$libname$shrext'
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF

@@ -1,18 +1,17 @@ 
 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])
-AM_INIT_AUTOMAKE([foreign 1.10 tar-pax dist-bzip2])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
+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
 
@@ -27,31 +26,69 @@ 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
+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.])
+])
+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 \
+	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
@@ -62,11 +99,35 @@ 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(alarm 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([ \
+	alarm \
+	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.
 AC_SEARCH_LIBS([catgets], [catgets], [], [])
@@ -76,558 +137,419 @@ 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_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_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_STRUCT_TM
-
-dnl ---------------
-dnl CHECK FOR ICONV
-dnl ---------------
-dnl Find iconv. It may be in libiconv and may be iconv() or libiconv()
-if test "x$ac_cv_header_iconv_h" = "xyes"; then
-    ac_found_iconv=no
-    AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-	[[#include <stdlib.h>
-	  #include <iconv.h>]],
-	[[
-	  iconv_open(NULL, NULL);
-	  return 0;
-	]]
-	)],
-	[
-	    ac_found_iconv=yes
-	],
-	[ ])
-
-    AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-	[[#include <stdlib.h>
-	  #include <iconv.h>]],
-	[[
-	  libiconv_open(NULL, NULL);
-	  return 0;
-	]]
-	)],
-	[
-	    ac_found_iconv=yes
-	],
-	[ ])
+	AC_CHECK_LIB([rt], [clock_gettime], [LIBS="-lrt $LIBS"])
+], [
+	AC_MSG_RESULT([no])
+])
 
-    if test "x$ac_found_iconv" = xyes; then
-	AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-	AC_CHECK_LIB(iconv, iconv_open, LIBS="-liconv $LIBS")
-	AC_CHECK_LIB(iconv, libiconv_open, LIBS="-liconv $LIBS")
+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])
+])
 
-dnl Check if iconv uses const in prototype declaration
-	AC_CACHE_CHECK(for iconv declaration,
-			ac_cv_iconv_const,
-			[AC_COMPILE_IFELSE(
-			    [AC_LANG_PROGRAM(
-			     [[#include <stdlib.h>
-			       #include <iconv.h>]],
-			     [[
-			       char **msg, **new_msg;
-			       size_t result, inleft, outleft;
-			       result = iconv((iconv_t)(-1), msg, &inleft, new_msg, &outleft);
-			       return 0;
-			     ]]
-			     )],
-			     [ac_cv_iconv_const=no],
-			     [ac_cv_iconv_const=yes])
-			])
-	if test "x$ac_cv_iconv_const" = xyes; then
-	    AC_DEFINE(HAVE_CONST_ICONV, 1, [Define if you have the iconv() function.])
-	fi
-    fi
-fi
+AM_ICONV
+AS_IF([test x$am_cv_proto_iconv_arg1 = "xconst"], [
+	AC_DEFINE([HAVE_CONST_ICONV], [1], [Is second argument of iconv() is of type 'const char **' or 'char **'])
+])
 
-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
-
-test x$no_x = "xyes" && AC_MSG_ERROR([Fluxbox requires the X Window System libraries and headers.])
+AS_IF([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 required functions in -lX11
-AC_CHECK_LIB(X11, XOpenDisplay, LIBS="-lX11 $LIBS", AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.]))
-LIBS="$X_EXTRA_LIBS $LIBS"
-
-AC_CHECK_LIB(xpg4, setlocale, LIBS="-lxpg4 $LIBS")
-AC_CHECK_PROGS(gencat_cmd, gencat)
-AS_IF(test "x$gencat_cmd" = "x",[NLS=""],[])
-
-Xext_lib=""
-
-
+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=""], [])
 
 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_MSG_CHECKING([whether to include Toolbar])
+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")],[])
-
-
-
-AC_MSG_CHECKING([whether to have Xft support])
-AM_PATH_XFT(yes, XFT=true, XFT=false)
-
-AS_IF(test "x$XFT" = "xtrue",[
-	AC_TRY_LINK([
-			#include <X11/Xft/Xft.h>
-		], [ XftFontClose(0, 0); return 1; ],
-	[
-
-		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")
-	FEATURES="$FEATURES XFT"
-		AC_MSG_RESULT(yes),
-		AC_MSG_RESULT(no)
-		)
-	],
-	[	AC_MSG_RESULT([Could not link with Xft. Install Xft if you want support for it.])
-		XFT=false
-	])])
-
-AM_CONDITIONAL(XFT, test "x$XFT" = "xtrue")
-
-
-AC_MSG_CHECKING([whether to have XRENDER (transparent) support])
-AC_ARG_ENABLE(xrender,
-	      AS_HELP_STRING([--enable-xrender],[XRENDER (transparent) support (default=yes)]),,[enable_xrender=yes])
-AC_MSG_RESULT([$enable_xrender])
-AS_IF(test "x$enable_xrender" = "xyes",[
-    AC_CHECK_LIB(Xrender, XRenderCreatePicture,
-	AC_DEFINE(HAVE_XRENDER, 1, "Xrender support")
-	LIBS="-lXrender $LIBS")
-    ],[])
+AS_IF([test "x$enable_timedcached" = "xyes"], [
+	AC_DEFINE([TIMEDCACHE], [1], [timed cache])
+])
 
-
-XPM=false
-AC_MSG_CHECKING([whether to have XPM (pixmap themes) support])
-AC_ARG_ENABLE(xpm,
-    AS_HELP_STRING([--enable-xpm],[XPM (pixmap themes) support (default=yes)]),[],[enable_xpm=yes])
-AC_MSG_RESULT([$enable_xpm])
-AS_IF(test "x$enable_xpm" = "xyes",[
-   AC_CHECK_LIB(Xpm, XpmReadFileToPixmap,
-		AC_DEFINE(HAVE_XPM, 1, "Xpm support")
-		XPM=true
-		LIBS="-lXpm $LIBS")
-   ],[])
-
-AM_CONDITIONAL(XPM, test "x$XPM" = "xtrue")
+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_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"])
 
-dnl Check whether to use imlib2
-IMLIB2=false
-AC_MSG_CHECKING([whether to have IMLIB2 (pixmap themes) support])
-AC_ARG_ENABLE(imlib2,
-    AS_HELP_STRING([--enable-imlib2], [IMLIB2 (pixmap themes) support (default=yes)]), , [enable_imlib2=yes])
-AC_MSG_RESULT([$enable_imlib2])
-AS_IF(test x$enable_imlib2 = "xyes",[
-    AC_PATH_GENERIC(imlib2, 1.0.0,[
-	IMLIB2=true
-	AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support])
-	LIBS="$IMLIB2_LIBS $LIBS"
-	CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS"
-	FEATURES="$FEATURES IMLIB2"
-	], []
-	)],[])
+dnl Check for imlib2
+have_imlib2=no
+AC_ARG_ENABLE([imlib2], AS_HELP_STRING([--disable-imlib2], [disable imlib2 support]))
+AS_IF([test "x$enable_imlib2" != "xno"], [
+	PKG_CHECK_MODULES([IMLIB2], [ imlib2 >= 1.0.0 ],
+		[AC_DEFINE([HAVE_IMLIB2], [1], [Define if imlib2 is available]) have_imlib2=yes], [have_imlib2=no])
+	AS_IF([test "x$have_imlib2" = xno -a "x$enable_imlib2" = xyes], [
+		AC_MSG_ERROR([*** imlib2 support requested but libraries not found])
+	])
+])
+AM_CONDITIONAL([IMLIB2], [test "$have_imlib2" = "yes"])
 
-AM_CONDITIONAL(IMLIB2, test "x$IMLIB2" = "xtrue")
+dnl Check for X11
+PKG_CHECK_MODULES([X11], [ x11 ],
+	[AC_DEFINE([HAVE_X11], [1], [Define if x11 is available]) have_x11=yes],
+	[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"], [
+	PKG_CHECK_MODULES([XFT], [ xft ],
+		[AC_DEFINE([USE_XFT], [1], [Define if xft is available]) have_xft=yes], [have_xft=no])
+	AS_IF([test "x$have_xft" = xno -a "x$enable_xft" = xyes], [
+		AC_MSG_ERROR([*** xft support requested but libraries not found])
+	])
+])
+AM_CONDITIONAL([XFT], [test "$have_xft" = "yes"])
+AS_IF([test "$have_xft" = "yes"], [
+	AC_CHECK_LIB([Xft], [XftDrawStringUtf8], [have_utf8=yes], [have_utf8=no])
+	AS_IF([test "$have_utf8" = yes], [
+		AC_DEFINE([HAVE_XFT_UTF8_STRING], [1], [Define if you have XftDrawStringUtf8])
+	])
+	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"])
 
-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_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")
+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"], [
+	PKG_CHECK_MODULES([XRENDER], [ xrender ],
+		[AC_DEFINE([HAVE_XRENDER], [1], [Define if xrender is available]) have_xrender=yes], [have_xrender=no])
+	AS_IF([test "x$have_xrender" = xno -a "x$enable_xrender" = xyes], [
+		AC_MSG_ERROR([*** xrender support requested but libraries not found])
+	])
+])
+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"], [
+	PKG_CHECK_MODULES([XPM], [ xpm ],
+		[AC_DEFINE([HAVE_XPM], [1], [Define if xpm is available]) have_xpm=yes], [have_xpm=no])
+	AS_IF([test "x$have_xpm" = xno -a "x$enable_xpm" = xyes], [
+		AC_MSG_ERROR([*** xpm support requested but libraries not found])
+	])
+])
+AM_CONDITIONAL([XPM], [test "$have_xpm" = "yes"])
 
 dnl Check for Xinerama support and proper library files.
-AC_MSG_CHECKING([whether to build support for the XINERAMA extension])
-AC_ARG_ENABLE(xinerama,
-	      AS_HELP_STRING([--enable-xinerama], [XINERAMA extension support (default=yes)]), ,[enable_xinerama=yes])
-
-AS_IF(test "x$enable_xinerama" = "xyes",[
-    AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
-		 AC_MSG_CHECKING([for X11/extensions/Xinerama.h])
-		 AC_TRY_COMPILE(
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xinerama.h>
-      , XineramaQueryScreens(0, 0),
-		 AC_MSG_RESULT([yes])
-		 AC_DEFINE(XINERAMA, [1], [Define to 1 if you have XINERAMA])
-		 LIBS="-lXinerama $LIBS"
-		 FEATURES="$FEATURES XINERAMA",
-		 AC_MSG_RESULT([no])))],[
-  AC_MSG_RESULT([no])
-  CONFIGOPTS="$CONFIGOPTS --disable-xinerama"])
-
+have_xinerama=no
+AC_ARG_ENABLE([xinerama], AS_HELP_STRING([--disable-xinerama], [disable xinerama support]))
+AS_IF([test "x$enable_xinerama" != "xno"], [
+	PKG_CHECK_MODULES([XINERAMA], [ xinerama ],
+		[AC_DEFINE([XINERAMA], [1], [Define if xinerama is available]) have_xinerama=yes], [have_xinerama=no])
+	AS_IF([test "x$have_xinerama" = xno -a "x$enable_xinerama" = xyes], [
+		AC_MSG_ERROR([*** xinerama support requested but libraries not found])
+	])
+])
+AM_CONDITIONAL([XINERAMA], [test "$have_xinerama" = "yes"])
 
 dnl Check for XShape extension support and proper library files.
-AC_MSG_CHECKING([whether to build support for the XSHAPE extension])
-AC_ARG_ENABLE(shape,
-	AS_HELP_STRING([--enable-shape], [XSHAPE extension support (default=yes)]), , [enable_shape=yes])
-AS_IF(test "x$enable_shape" = "xyes",[
-    AC_CHECK_LIB(Xext, XShapeCombineShape,
-	AC_MSG_CHECKING([for X11/extensions/shape.h])
-	AC_TRY_COMPILE(
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/shape.h>
-      , long foo = ShapeSet,
-	AC_MSG_RESULT([yes])
-	AC_DEFINE(SHAPE, [1], [Define to 1 if you have SHAPE])
-	LIBS="-lXext $LIBS"
-	FEATURES="$FEATURES SHAPE",
-	AC_MSG_RESULT([no])))],[
-  AC_MSG_RESULT([no])
-  CONFIGOPTS="$CONFIGOPTS --disable-shape"])
-
-
+have_xext=no
+AC_ARG_ENABLE([xext], AS_HELP_STRING([--disable-xext], [disable Misc X Extension Library support]))
+AS_IF([test "x$enable_xext" != "xno"], [
+	PKG_CHECK_MODULES([XEXT], [ xext ],
+		[AC_DEFINE([SHAPE], [1], [Define if xext is available]) have_xext=yes], [have_xext=no])
+	AS_IF([test "x$have_xext" = xno -a "x$enable_xext" = xyes], [
+		AC_MSG_ERROR([*** xext support requested but libraries not found])
+	])
+])
+AM_CONDITIONAL([XEXT], [test "$have_xext" = "yes"])
 
 dnl Check for RANDR support and proper library files.
-
-AC_MSG_CHECKING([whether to build support for the XRANDR (X Resize And Rotate) extension])
-AC_ARG_ENABLE(randr,
-	AS_HELP_STRING([--enable-randr], [XRANDR extension support (default=no)]),,[enable_randr=yes])
-
-AS_IF(test "x$enable_randr" = "xyes", [
-    AC_MSG_RESULT([yes])
-    AC_CHECK_LIB(Xrandr, XRRQueryExtension, [
-	AC_MSG_CHECKING([for X11/extensions/Xrandr.h])
-	AC_COMPILE_IFELSE([
-	    AC_LANG_PROGRAM([[#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xrandr.h>
-		]], [[XRRQueryExtension(0, 0, 0);]]
-	    )], [
-	    AC_MSG_RESULT([yes])
-	    AC_DEFINE(HAVE_RANDR, [1], [Define to 1 if you have RANDR])
-	    LIBS="-lXrandr $LIBS"
-	    FEATURES="$FEATURES RANDR"
-
-	    AC_MSG_CHECKING([for XRRUpdateConfiguration])
-	    AC_COMPILE_IFELSE([
-		AC_LANG_PROGRAM([[#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xrandr.h>
-		    ]], [[XRRUpdateConfiguration(0);]]
-		)], [
-		    AC_MSG_RESULT([yes])
-		    AC_DEFINE(HAVE_RANDR1_2, [1], [Define to 1 if you have RANDR 1.2])
-		], [
-		    AC_MSG_RESULT([no])
-		])
-	    ], [
-		AC_MSG_RESULT([no])
-	    ])
-	],[
-	AC_MSG_RESULT([no])
-    ])],[
-    AC_MSG_RESULT([no])
-    CONFIGOPTS="$CONFIGOPTS --disable-randr"])
-
-
-
-
-AC_MSG_CHECKING([whether to have FRIBIDI support])
-AC_ARG_ENABLE(fribidi,
-	AS_HELP_STRING([--enable-fribidi], [FRIBIDI support (default=yes)]), , [enable_fribidi=yes])
-AS_IF(test "x$enable_fribidi" = "xyes",[
-	AC_MSG_RESULT([yes])
-	AC_CHECK_LIB(fribidi, fribidi_version_info,
-		AC_MSG_CHECKING([for fribidi/fribidi.h])
-		AC_TRY_COMPILE(
-#include <fribidi/fribidi.h>
-      , fribidi_version_info,
-			AC_MSG_RESULT([yes])
-			AC_DEFINE(HAVE_FRIBIDI, [1], [Define to 1 if you have FRIBIDI])
-			LIBS="-lfribidi $LIBS",
-		AC_MSG_RESULT([no])))],[
-    AC_MSG_RESULT([no])
-    CONFIGOPTS="$CONFIGOPTS --disable-fribidi"])
+have_xrandr=no
+AC_ARG_ENABLE([xrandr], AS_HELP_STRING([--disable-xrandr], [disable xrandr support]))
+AS_IF([test "x$enable_xrandr" != "xno"], [
+	PKG_CHECK_MODULES([RANDR], [ xrandr >= 1.4.0 ],
+		[AC_DEFINE([HAVE_RANDR], [1], [Define if xrandr is available]) have_xrandr=yes], [have_xrandr=no])
+	AS_IF([test "x$have_xrandr" = xno -a "x$enable_xrandr" = xyes], [
+		AC_MSG_ERROR([*** xrandr support requested but libraries not found])
+	])
+])
+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"], [
+	PKG_CHECK_MODULES([FRIBIDI], [ fribidi ],
+		[AC_DEFINE([HAVE_FRIBIDI], [1], [Define if fribidi is available]) have_fribidi=yes], [have_fribidi=no])
+	AS_IF([test "x$have_fribidi" = xno -a "x$enable_fribidi" = xyes], [
+		AC_MSG_ERROR([*** fribidi support requested but libraries not found])
+	])
+])
+AM_CONDITIONAL([FRIBIDI], [test "$have_fribidi" = "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)
+AC_SUBST([DEFAULT_INIT], [$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)
+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
-src/tests/Makefile
-util/Makefile
-util/fbrun/Makefile
-data/Makefile
-data/styles/Makefile
-data/styles/BlueFlux/Makefile
-data/styles/BlueFlux/pixmaps/Makefile
-data/styles/Emerge/Makefile
-data/styles/Emerge/pixmaps/Makefile
-data/styles/arch/Makefile
-data/styles/arch/pixmaps/Makefile
-data/styles/zimek_bisque/Makefile
-data/styles/zimek_darkblue/Makefile
-data/styles/zimek_green/Makefile
-data/styles/ostrich/Makefile
-data/styles/green_tea/Makefile
-data/styles/bora_black/Makefile
-data/styles/bora_blue/Makefile
-data/styles/bora_green/Makefile
-data/styles/carp/Makefile
-data/styles/bloe/Makefile
-data/styles/bloe/pixmaps/Makefile
-doc/Makefile
-nls/Makefile
 nls/C/Makefile
 nls/be_BY/Makefile
 nls/bg_BG/Makefile
@@ -666,22 +588,20 @@ nls/uk_UA/Makefile
 nls/vi_VN/Makefile
 nls/zh_CN/Makefile
 nls/zh_TW/Makefile
-)
+])
 
 dnl Print results
 AC_MSG_RESULT([])
 AC_MSG_RESULT([	$PACKAGE version $VERSION configured successfully.])
 AC_MSG_RESULT([])
-AC_MSG_RESULT([Features:])
-AC_MSG_RESULT([	$FEATURES])
-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:])

@@ -1,62 +0,0 @@ 
-# data/Makefile.am for Fluxbox - an X11 Window manager
-
-PROGRAM_PREFIX=@program_prefix@
-PROGRAM_SUFFIX=@program_suffix@
-
-DEFAULT_MENU = @DEFAULT_MENU@
-DEFAULT_STYLE = @DEFAULT_STYLE@
-DEFAULT_KEYS = @DEFAULT_KEYS@
-DEFAULT_APPS = @DEFAULT_APPS@
-DEFAULT_OVERLAY = @DEFAULT_OVERLAY@
-DEFAULT_INIT = @DEFAULT_INIT@
-DEFAULT_WINDOWMENU = @DEFAULT_WINDOWMENU@
-
-SUBDIRS= 		styles
-CLEANFILES= 		menu menu.in menu.pre menu.bak init apps
-MAINTAINERCLEANFILES= 	Makefile.in
-pkgdata_DATA= 		keys menu init apps overlay windowmenu
-EXTRA_DIST= 		keys init.in apps.in overlay windowmenu
-all-local: 		menu init apps
-install-pkgdataDATA:
-	@echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
-	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU))
-	$(INSTALL_DATA) ./menu $(DESTDIR)$(DEFAULT_MENU)
-	@echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
-	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
-	$(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
-	@echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)"
-	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS))
-	$(INSTALL_DATA) ./apps $(DESTDIR)$(DEFAULT_APPS)
-	@echo "Installing overlay file in $(DESTDIR)$(DEFAULT_OVERLAY)"
-	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_OVERLAY))
-	$(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY)
-	@echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
-	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
-	$(INSTALL_DATA) ./init $(DESTDIR)$(DEFAULT_INIT)
-	@echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)"
-	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU))
-	$(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU)
-
-distclean-local:
-		rm -f *\~
-init: 			init.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
-			-e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-			-e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-			-e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
-
-apps: 			apps.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
-			-e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-			-e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" $(srcdir)/apps.in > apps
-
-menu: 			../util/fluxbox-generate_menu
-	env	MENUFILENAME=menu \
-		PREFIX="${prefix}" \
-		MENUTITLE="Fluxbox-${VERSION}" \
-		INSTALL=Yes \
-		PATH="${PATH}:../util:../util/fbrun" \
-		../util/fluxbox-generate_menu
-
-../util/fluxbox-generate_menu:
-	cd ../util && ${MAKE} fluxbox-generate_menu

@@ -0,0 +1,57 @@ 
+# data/Makefile.am for Fluxbox - an X11 Window manager
+
+EXTRA_DIST += \
+	data/keys \
+	data/overlay \
+	data/windowmenu
+
+PATHFILES += \
+	data/apps \
+	data/init
+
+include data/styles/carp/Makemodule.am
+include data/styles/bora_blue/Makemodule.am
+include data/styles/green_tea/Makemodule.am
+include data/styles/bora_green/Makemodule.am
+include data/styles/Makemodule.am
+include data/styles/zimek_bisque/Makemodule.am
+include data/styles/bloe/pixmaps/Makemodule.am
+include data/styles/bloe/Makemodule.am
+include data/styles/Emerge/pixmaps/Makemodule.am
+include data/styles/Emerge/Makemodule.am
+include data/styles/ostrich/Makemodule.am
+include data/styles/zimek_green/Makemodule.am
+include data/styles/zimek_darkblue/Makemodule.am
+include data/styles/BlueFlux/pixmaps/Makemodule.am
+include data/styles/BlueFlux/Makemodule.am
+include data/styles/bora_black/Makemodule.am
+include data/styles/arch/pixmaps/Makemodule.am
+include data/styles/arch/Makemodule.am
+
+install-pkgdataDATA:
+	@echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
+	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU))
+	$(INSTALL_DATA) ./menu $(DESTDIR)$(DEFAULT_MENU)
+	@echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
+	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
+	$(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
+	@echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)"
+	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS))
+	$(INSTALL_DATA) ./apps $(DESTDIR)$(DEFAULT_APPS)
+	@echo "Installing overlay file in $(DESTDIR)$(DEFAULT_OVERLAY)"
+	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_OVERLAY))
+	$(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY)
+	@echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
+	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
+	$(INSTALL_DATA) ./init $(DESTDIR)$(DEFAULT_INIT)
+	@echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)"
+	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU))
+	$(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU)
+
+menu:
+	env	MENUFILENAME=menu \
+		PREFIX="${prefix}" \
+		MENUTITLE="Fluxbox-${VERSION}" \
+		INSTALL=Yes \
+		PATH="${PATH}:../util:../util/fbrun" \
+		util/fluxbox-generate_menu

@@ -1,6 +0,0 @@ 
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/BlueFlux
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+blueflux_styledir = $(pkgdatadir)/styles/BlueFlux
+
+dist_blueflux_style_DATA = data/styles/BlueFlux/theme.cfg

@@ -1,2 +0,0 @@ 
-Makefile
-Makefile.in

@@ -1,11 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/BlueFlux/pixmaps
-
-style_DATA = button_close_active.xpm button_close_pressed.xpm \
-	button_close_unfocus.xpm button_max_active.xpm button_max_pressed.xpm \
-	button_max_unfocus.xpm button_min_active.xpm button_min_pressed.xpm \
-	button_min_unfocus.xpm button_stick_active.xpm button_stick_pressed.xpm \
-	button_stick_unfocus.xpm button_stuck.xpm button_stuck_unfocus.xpm \
-	button_toolbar.xpm button_toolbar_pressed.xpm menu_frame.xpm title_bar.xpm \
-	title_bar_unfocus.xpm toolbar.xpm toolbar_label.xpm
-
-include ../../Makefile.include

@@ -0,0 +1,24 @@ 
+blueflux_pixmaps_styledir = $(pkgdatadir)/styles/BlueFlux/pixmaps
+
+dist_blueflux_pixmaps_style_DATA = \
+	data/styles/BlueFlux/pixmaps/button_close_active.xpm \
+	data/styles/BlueFlux/pixmaps/button_close_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/button_close_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_max_active.xpm \
+	data/styles/BlueFlux/pixmaps/button_max_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/button_max_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_min_active.xpm \
+	data/styles/BlueFlux/pixmaps/button_min_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/button_min_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_stick_active.xpm \
+	data/styles/BlueFlux/pixmaps/button_stick_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/button_stick_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_stuck.xpm \
+	data/styles/BlueFlux/pixmaps/button_stuck_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_toolbar.xpm \
+	data/styles/BlueFlux/pixmaps/button_toolbar_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/menu_frame.xpm \
+	data/styles/BlueFlux/pixmaps/title_bar.xpm \
+	data/styles/BlueFlux/pixmaps/title_bar_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/toolbar.xpm \
+	data/styles/BlueFlux/pixmaps/toolbar_label.xpm

@@ -1,6 +0,0 @@ 
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/Emerge
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+emerge_styledir = $(pkgdatadir)/styles/Emerge
+
+dist_emerge_style_DATA = data/styles/Emerge/theme.cfg

@@ -1,2 +0,0 @@ 
-Makefile
-Makefile.in

@@ -1,8 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/Emerge/pixmaps
-
-style_DATA = bullet.xpm close.xpm icon.xpm max.xpm stick-unfocus.xpm \
-	stuck-unfocus.xpm close-pressed.xpm icon-pressed.xpm max-pressed.xpm \
-	selected.xpm stick.xpm stuck.xpm close-unfocus.xpm icon-unfocus.xpm \
-    max-unfocus.xpm stick-pressed.xpm stuck-pressed.xpm unselected.xpm
-
-include ../../Makefile.include

@@ -0,0 +1,21 @@ 
+emerge_pixmaps_styledir = $(pkgdatadir)/styles/Emerge/pixmaps
+
+dist_emerge_pixmaps_style_DATA = \
+	data/styles/Emerge/pixmaps/bullet.xpm \
+	data/styles/Emerge/pixmaps/close-pressed.xpm \
+	data/styles/Emerge/pixmaps/close-unfocus.xpm \
+	data/styles/Emerge/pixmaps/close.xpm \
+	data/styles/Emerge/pixmaps/icon-pressed.xpm \
+	data/styles/Emerge/pixmaps/icon-unfocus.xpm \
+	data/styles/Emerge/pixmaps/icon.xpm \
+	data/styles/Emerge/pixmaps/max-pressed.xpm \
+	data/styles/Emerge/pixmaps/max-unfocus.xpm \
+	data/styles/Emerge/pixmaps/max.xpm \
+	data/styles/Emerge/pixmaps/selected.xpm \
+	data/styles/Emerge/pixmaps/stick-pressed.xpm \
+	data/styles/Emerge/pixmaps/stick-unfocus.xpm \
+	data/styles/Emerge/pixmaps/stick.xpm \
+	data/styles/Emerge/pixmaps/stuck-pressed.xpm \
+	data/styles/Emerge/pixmaps/stuck-unfocus.xpm \
+	data/styles/Emerge/pixmaps/stuck.xpm \
+	data/styles/Emerge/pixmaps/unselected.xpm

@@ -1,11 +0,0 @@ 
-SUBDIRS=Emerge BlueFlux bora_black bora_blue bora_green \
-	zimek_bisque zimek_darkblue zimek_green \
-	arch carp ostrich green_tea bloe
-
-styledir = $(pkgdatadir)/styles
-
-style_DATA = Makro MerleyKay Artwiz Flux \
-	Nyz Operation Outcomes Results Shade LemonSpace \
-	Twice qnx-photon BlueNight Meta
-
-include Makefile.include

@@ -1,10 +0,0 @@ 
-## included by all Makefile.am files under the data/styles directory
-
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST=$(style_DATA)
-
-uninstall-hook:
-	rmdir $(DESTDIR)$(styledir)
-distclean-local:
-	rm -f *\~

@@ -0,0 +1,19 @@ 
+styledir = $(pkgdatadir)/styles
+
+style_DATA = \
+	data/styles/Artwiz \
+	data/styles/BlueNight \
+	data/styles/Flux \
+	data/styles/LemonSpace \
+	data/styles/Makro \
+	data/styles/MerleyKay \
+	data/styles/Meta \
+	data/styles/Nyz \
+	data/styles/Operation \
+	data/styles/Outcomes \
+	data/styles/Results \
+	data/styles/Shade \
+	data/styles/Twice \
+	data/styles/qnx-photon
+
+EXTRA_DIST += $(style_DATA)

@@ -1,6 +0,0 @@ 
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/arch
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+arch_styledir = $(pkgdatadir)/styles/arch
+
+dist_arch_style_DATA = data/styles/arch/theme.cfg

@@ -1,12 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/arch/pixmaps
-
-style_DATA = closepr.xpm gripfcs.xpm maxufcs.xpm menuiconufcs.xpm \
-	 minufcs.xpm shadepr.xpm stickpr.xpm stuckufcs.xpm unselected.xpm \
-	 unshadeufcs.xpm bullet.xpm closeufcs.xpm maxfcs.xpm \
-	 menuiconfcs.xpm minfcs.xpm selected.xpm shadeufcs.xpm \
-	 stickufcs.xpm tbarfcs.xpm unshadefcs.xpm closefcs.xpm \
-	frame.xpm maxpr.xpm menuiconpr.xpm minpr.xpm shadefcs.xpm \
-	 stickfcs.xpm stuckfcs.xpm tbarufcs.xpm unshadepr.xpm
-
-
-include ../../Makefile.include

@@ -0,0 +1,33 @@ 
+arch_pixmaps_styledir = $(pkgdatadir)/styles/arch/pixmaps
+
+dist_arch_pixmaps_style_DATA = \
+	data/styles/arch/pixmaps/bullet.xpm \
+	data/styles/arch/pixmaps/closefcs.xpm \
+	data/styles/arch/pixmaps/closepr.xpm \
+	data/styles/arch/pixmaps/closeufcs.xpm \
+	data/styles/arch/pixmaps/frame.xpm \
+	data/styles/arch/pixmaps/gripfcs.xpm \
+	data/styles/arch/pixmaps/maxfcs.xpm \
+	data/styles/arch/pixmaps/maxpr.xpm \
+	data/styles/arch/pixmaps/maxufcs.xpm \
+	data/styles/arch/pixmaps/menuiconfcs.xpm \
+	data/styles/arch/pixmaps/menuiconpr.xpm \
+	data/styles/arch/pixmaps/menuiconufcs.xpm \
+	data/styles/arch/pixmaps/minfcs.xpm \
+	data/styles/arch/pixmaps/minpr.xpm \
+	data/styles/arch/pixmaps/minufcs.xpm \
+	data/styles/arch/pixmaps/selected.xpm \
+	data/styles/arch/pixmaps/shadefcs.xpm \
+	data/styles/arch/pixmaps/shadepr.xpm \
+	data/styles/arch/pixmaps/shadeufcs.xpm \
+	data/styles/arch/pixmaps/stickfcs.xpm \
+	data/styles/arch/pixmaps/stickpr.xpm \
+	data/styles/arch/pixmaps/stickufcs.xpm \
+	data/styles/arch/pixmaps/stuckfcs.xpm \
+	data/styles/arch/pixmaps/stuckufcs.xpm \
+	data/styles/arch/pixmaps/tbarfcs.xpm \
+	data/styles/arch/pixmaps/tbarufcs.xpm \
+	data/styles/arch/pixmaps/unselected.xpm \
+	data/styles/arch/pixmaps/unshadefcs.xpm \
+	data/styles/arch/pixmaps/unshadepr.xpm \
+	data/styles/arch/pixmaps/unshadeufcs.xpm

@@ -1,6 +0,0 @@ 
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/bloe
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+bloe_styledir = $(pkgdatadir)/styles/bloe
+
+dist_bloe_style_DATA = data/styles/bloe/theme.cfg

@@ -1,13 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/bloe/pixmaps
-
-style_DATA = bullet.xpm closepr.xpm frame.xpm maxfcs.xpm \
-	maxufcs.xpm menuiconpr.xpm minfcs.xpm minufcs.xpm \
-	shadefcs.xpm shadeufcs.xpm stickpr.xpm stuckfcs.xpm \
-	tbarfcs.xpm unselected.xpm unshadepr.xpm \
-	windowlabelfcs.xpm closefcs.xpm closeufcs.xpm \
-	maxpr.xpm menuiconfcs.xpm menuiconufcs.xpm \
-	minpr.xpm selected.xpm shadepr.xpm stickfcs.xpm \
-	stickufcs.xpm stuckufcs.xpm tbarufcs.xpm \
-	unshadefcs.xpm unshadeufcs.xpm windowlabelufcs.xpm
-
-include ../../Makefile.include

@@ -0,0 +1,34 @@ 
+pixmaps_styledir = $(pkgdatadir)/styles/bloe/pixmaps
+
+dist_pixmaps_style_DATA = \
+	data/styles/bloe/pixmaps/bullet.xpm \
+	data/styles/bloe/pixmaps/closefcs.xpm \
+	data/styles/bloe/pixmaps/closepr.xpm \
+	data/styles/bloe/pixmaps/closeufcs.xpm \
+	data/styles/bloe/pixmaps/frame.xpm \
+	data/styles/bloe/pixmaps/maxfcs.xpm \
+	data/styles/bloe/pixmaps/maxpr.xpm \
+	data/styles/bloe/pixmaps/maxufcs.xpm \
+	data/styles/bloe/pixmaps/menuiconfcs.xpm \
+	data/styles/bloe/pixmaps/menuiconpr.xpm \
+	data/styles/bloe/pixmaps/menuiconufcs.xpm \
+	data/styles/bloe/pixmaps/minfcs.xpm \
+	data/styles/bloe/pixmaps/minpr.xpm \
+	data/styles/bloe/pixmaps/minufcs.xpm \
+	data/styles/bloe/pixmaps/selected.xpm \
+	data/styles/bloe/pixmaps/shadefcs.xpm \
+	data/styles/bloe/pixmaps/shadepr.xpm \
+	data/styles/bloe/pixmaps/shadeufcs.xpm \
+	data/styles/bloe/pixmaps/stickfcs.xpm \
+	data/styles/bloe/pixmaps/stickpr.xpm \
+	data/styles/bloe/pixmaps/stickufcs.xpm \
+	data/styles/bloe/pixmaps/stuckfcs.xpm \
+	data/styles/bloe/pixmaps/stuckufcs.xpm \
+	data/styles/bloe/pixmaps/tbarfcs.xpm \
+	data/styles/bloe/pixmaps/tbarufcs.xpm \
+	data/styles/bloe/pixmaps/unselected.xpm \
+	data/styles/bloe/pixmaps/unshadefcs.xpm \
+	data/styles/bloe/pixmaps/unshadepr.xpm \
+	data/styles/bloe/pixmaps/unshadeufcs.xpm \
+	data/styles/bloe/pixmaps/windowlabelfcs.xpm \
+	data/styles/bloe/pixmaps/windowlabelufcs.xpm

@@ -1,5 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/bora_black
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+bora_black_styledir = $(pkgdatadir)/styles/bora_black
+
+dist_bora_black_style_DATA = data/styles/bora_black/theme.cfg

@@ -1,5 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/bora_blue
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+bora_blue_styledir = $(pkgdatadir)/styles/bora_blue
+
+dist_bora_blue_style_DATA = data/styles/bora_blue/theme.cfg

@@ -1,5 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/bora_green
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+bora_green_styledir = $(pkgdatadir)/styles/bora_green
+
+dist_bora_green_style_DATA = data/styles/bora_green/theme.cfg

@@ -1,5 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/carp
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+carp_styledir = $(pkgdatadir)/styles/carp
+
+dist_carp_style_DATA = data/styles/carp/theme.cfg

@@ -1,5 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/green_tea
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+green_tea_styledir = $(pkgdatadir)/styles/green_tea
+
+dist_green_tea_style_DATA = data/styles/green_tea/theme.cfg

@@ -1,5 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/ostrich
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+ostrich_styledir = $(pkgdatadir)/styles/ostrich
+
+dist_ostrich_style_DATA = data/styles/ostrich/theme.cfg

@@ -1,5 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/zimek_bisque
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+zimek_bisque_styledir = $(pkgdatadir)/styles/zimek_bisque
+
+dist_zimek_bisque_style_DATA = data/styles/zimek_bisque/theme.cfg

@@ -1,5 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/zimek_darkblue
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+zimek_darkblue_styledir = $(pkgdatadir)/styles/zimek_darkblue
+
+dist_zimek_darkblue_style_DATA = data/styles/zimek_darkblue/theme.cfg

@@ -1,5 +0,0 @@ 
-styledir = $(pkgdatadir)/styles/zimek_green
-
-style_DATA = theme.cfg
-
-include ../Makefile.include

@@ -0,0 +1,3 @@ 
+zimek_green_styledir = $(pkgdatadir)/styles/zimek_green
+
+dist_zimek_green_style_DATA = data/styles/zimek_green/theme.cfg

@@ -1,17 +0,0 @@ 
-# doc/Makefile.am for Fluxbox 0.9  - an X11 Window manager
-# Makefile.am for fluxbox/doc
-
-CLEANFILES = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 startfluxbox.1 fluxbox-apps.5 \
-	fluxbox-keys.5 fluxbox-menu.5 fluxbox-remote.1 fluxbox-style.5
-MAINTAINERCLEANFILES = Makefile.in
-man_MANS = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox-apps.5 \
-	fluxbox-keys.5 fluxbox-menu.5 fluxbox-remote.1 fluxbox-style.5 \
-	startfluxbox.1
-EXTRA_DIST=startfluxbox.1.in CODESTYLE \
-	fluxbox.1.in fbrun.1.in fbsetbg.1.in fbsetroot.1.in fluxbox-apps.5.in \
-	fluxbox-keys.5.in fluxbox-menu.5.in fluxbox-remote.1.in fluxbox-style.5.in
-distclean-local:
-	rm -f *\~
-
-%: %.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $^ > $@

@@ -0,0 +1,39 @@ 
+CLEANFILES += \
+	doc/fbrun.1 \
+	doc/fbsetbg.1 \
+	doc/fbsetroot.1 \
+	doc/fluxbox-apps.5 \
+	doc/fluxbox-keys.5 \
+	doc/fluxbox-menu.5 \
+	doc/fluxbox-remote.1 \
+	doc/fluxbox-style.5 \
+	doc/fluxbox.1 \
+	doc/startfluxbox.1
+
+dist_man_MANS = \
+	doc/fbrun.1 \
+	doc/fbsetbg.1 \
+	doc/fbsetroot.1 \
+	doc/fluxbox-apps.5 \
+	doc/fluxbox-keys.5 \
+	doc/fluxbox-menu.5 \
+	doc/fluxbox-remote.1 \
+	doc/fluxbox-style.5 \
+	doc/fluxbox.1 \
+	doc/startfluxbox.1
+
+EXTRA_DIST += \
+	doc/CODESTYLE \
+	doc/fbrun.1.in \
+	doc/fbsetbg.1.in \
+	doc/fbsetroot.1.in \
+	doc/fluxbox-apps.5.in \
+	doc/fluxbox-keys.5.in \
+	doc/fluxbox-menu.5.in \
+	doc/fluxbox-remote.1.in \
+	doc/fluxbox-style.5.in \
+	doc/fluxbox.1.in \
+	doc/startfluxbox.1.in
+
+%: %.in
+	@regex_cmd@ -e "s,@pkgdatadir[@],$(pkgdatadir)," $^ > $@

@@ -2,10 +2,24 @@ #
 # create manpages from the asciidoc files
 #
 
-SRC1 = fluxbox.txt fluxbox-remote.txt fbrun.txt fbsetbg.txt fbsetroot.txt startfluxbox.txt
-SRC5 = fluxbox-keys.txt fluxbox-apps.txt fluxbox-style.txt fluxbox-menu.txt
+SRC1 = \
+	fbrun.txt \
+	fbsetbg.txt \
+	fbsetroot.txt \
+	fluxbox-remote.txt \
+	fluxbox.txt \
+	startfluxbox.txt
 
-MAN = $(SRC1:.txt=.1) $(SRC5:.txt=.5)
+SRC5 = \
+	fluxbox-apps.txt \
+	fluxbox-keys.txt \
+	fluxbox-menu.txt \
+	fluxbox-style.txt
+
+MAN = \
+	$(SRC1:.txt=.1) \
+	$(SRC5:.txt=.5)
+
 MANdotIN = $(addsuffix .in,$(MAN))
 DISTFILES = $(addprefix ../,$(MANdotIN))
 

@@ -1,24 +0,0 @@ 
-# nls/Makefile.am for fluxbox - http://fluxbox.org
-
-LOCALE_PATH = @LOCALE_PATH@
-NLSTEST = @NLS@
-SUBDIRS = C cs_CZ da_DK es_AR es_ES et_EE fr_FR pt_BR ru_RU \
-		  sv_SE tr_TR it_IT pt_PT bg_BG ja_JP ko_KR \
-		  lv_LV de_DE nl_NL no_NO sl_SI pl_PL vi_VN be_BY \
-		  uk_UA el_GR nb_NO zh_CN fi_FI en_US en_GB de_CH \
-		  de_AT fr_CH sk_SK zh_TW mk_MK he_IL
-
-MAINTAINERCLEANFILES = Makefile.in fluxbox-nls.hh
-EXTRA_DIST=fluxbox-nls.hh nlsinfo
-BUILT_SOURCES=fluxbox-nls.hh
-
-uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rmdir $(DESTDIR)$(LOCALE_PATH); \
-	fi
-distclean-local:
-	rm -f *\~
-
-fluxbox-nls.hh:
-	chmod +x $(srcdir)/nlsinfo
-	$(srcdir)/nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > fluxbox-nls.hh

@@ -0,0 +1,53 @@ 
+# nls/Makefile.am for fluxbox - http://fluxbox.org
+
+LOCALE_PATH = @LOCALE_PATH@
+NLSTEST = @NLS@
+
+SUBDIRS = \
+	nls/C \
+	nls/be_BY \
+	nls/bg_BG \
+	nls/cs_CZ \
+	nls/da_DK \
+	nls/de_AT \
+	nls/de_CH \
+	nls/de_DE \
+	nls/el_GR \
+	nls/en_GB \
+	nls/en_US \
+	nls/es_AR \
+	nls/es_ES \
+	nls/et_EE \
+	nls/fi_FI \
+	nls/fr_CH \
+	nls/fr_FR \
+	nls/he_IL \
+	nls/it_IT \
+	nls/ja_JP \
+	nls/ko_KR \
+	nls/lv_LV \
+	nls/mk_MK \
+	nls/nb_NO \
+	nls/nl_NL \
+	nls/no_NO \
+	nls/pl_PL \
+	nls/pt_BR \
+	nls/pt_PT \
+	nls/ru_RU \
+	nls/sk_SK \
+	nls/sl_SI \
+	nls/sv_SE \
+	nls/tr_TR \
+	nls/uk_UA \
+	nls/vi_VN \
+	nls/zh_CN \
+	nls/zh_TW
+
+uninstall-local:
+	@if test x$(NLSTEST) = "x-DNLS"; then \
+		rmdir $(DESTDIR)$(LOCALE_PATH); \
+	fi
+
+fluxbox-nls.hh:
+	chmod +x $(srcdir)/nlsinfo
+	$(srcdir)/nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > fluxbox-nls.hh

@@ -34,11 +34,6 @@ #include "FbTk/App.hh"
 #include "FbTk/stringstream.hh"
 #include "FbTk/STLUtil.hh"
 
-// use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <fstream>
 #include <string>
 #include <memory>

@@ -37,10 +37,6 @@ #include "FbTk/MenuItem.hh"
 #include "FbTk/I18n.hh"
 #include "FbTk/FbTime.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CTIME
   #include <ctime>
 #else

@@ -39,10 +39,6 @@ #include "FbTk/StringUtil.hh"
 #include "FbTk/Util.hh"
 #include "FbTk/RelCalcHelper.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTDLIB
 #include <cstdlib>
 #else

@@ -1,10 +1,6 @@ 
 #ifndef DEBUG_HH
 #define DEBUG_HH
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef DEBUG
 #include <iostream>
 #define fbdbg std::cerr<<__FILE__<<"("<<__LINE__<< "): "

@@ -54,11 +54,6 @@ #else
   #include <string.h>
 #endif
 
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #if defined(__EMX__) && defined(HAVE_PROCESS_H)
 #include <process.h> // for P_NOWAIT
 #endif // __EMX__

@@ -55,7 +55,7 @@ typedef int iconv_t;
 #endif // HAVE_ICONV
 
 #ifdef HAVE_FRIBIDI
-  #include <fribidi/fribidi.h>
+  #include <fribidi.h>
 #endif
 
 #ifdef DEBUG

@@ -25,7 +25,6 @@ #define FBTK_FBSTRING_HH
 
 #include <string>
 
-#include "config.h"
 #ifdef HAVE_ICONV
 #include <iconv.h>
 #endif // HAVE_ICONV

@@ -22,12 +22,6 @@ 
 #ifndef FBTK_FBTIME_HH
 #define FBTK_FBTIME_HH
 
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
 #endif // HAVE_INTTYPES_H

@@ -28,10 +28,6 @@ #include "Color.hh"
 #include "App.hh"
 #include "Transparent.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 

@@ -22,9 +22,6 @@ 
 #ifndef FBTK_FILEUTIL_HH
 #define FBTK_FILEUTIL_HH
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
 #ifdef HAVE_CTIME
   #include <ctime>
 #else

@@ -25,10 +25,6 @@ #include "Font.hh"
 #include "FontImp.hh"
 #include "App.hh"
 
-#ifdef    HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 // for antialias
 #ifdef USE_XFT
 #include "XftFontImp.hh"
@@ -43,10 +39,6 @@ // standard font system
 #include "XFontImp.hh"
 
 #include "GContext.hh"
-//use gnu extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif //_GNU_SOURCE
 
 #ifndef __USE_GNU
 #define __USE_GNU

@@ -24,10 +24,6 @@ #define FBTK_FONT_HH
 
 #include <X11/Xlib.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "FbString.hh"
 #include "Color.hh"
 #include "Orientation.hh"

@@ -30,11 +30,6 @@ * A copy of which is available (at the time of writing) here:
  * http://www.kulichki.com/moshkow/CYRILLIC/locale-tutorial-0_8.txt
  */
 
-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include "I18n.hh"
 #include "FileUtil.hh"
 

@@ -30,11 +30,6 @@ #include "../../nls/fluxbox-nls.hh"
 
 #include "FbString.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif // HAVE_LOCALE_H

@@ -23,10 +23,6 @@ #include "Image.hh"
 #include "StringUtil.hh"
 #include "FileUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XPM
 #include "ImageXPM.hh"
 #endif // HAVE_XPM

@@ -30,16 +30,6 @@ #include "App.hh"
 #include "SimpleCommand.hh"
 #include "I18n.hh"
 
-//use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif // HAVE_SYS_TYPES_H

@@ -1,74 +0,0 @@ 
-noinst_LIBRARIES = libFbTk.a
-
-AM_CPPFLAGS=@CPPFLAGS@
-
-if XFT
-xft_SOURCE= XftFontImp.hh XftFontImp.cc
-endif
-if MULTIBYTE
-xmb_SOURCE= XmbFontImp.hh XmbFontImp.cc
-endif
-if XPM
-xpm_SOURCE= ImageXPM.hh ImageXPM.cc
-endif
-if IMLIB2
-imlib2_SOURCE= ImageImlib2.hh ImageImlib2.cc
-endif
-
-libFbTk_a_SOURCES = App.hh App.cc \
-	Color.cc Color.hh Command.hh \
-	ColorLUT.cc ColorLUT.hh \
-	Accessor.hh DefaultValue.hh \
-	FileUtil.hh FileUtil.cc \
-	EventHandler.hh EventManager.hh EventManager.cc \
-	FbWindow.hh FbWindow.cc Font.cc Font.hh FontImp.hh \
-	I18n.cc I18n.hh \
-	CommandParser.hh \
-	RadioMenuItem.hh \
-	ImageControl.hh ImageControl.cc \
-	LogicCommands.hh LogicCommands.cc \
-	MacroCommand.hh MacroCommand.cc \
-	Menu.hh Menu.cc MenuItem.hh MenuItem.cc \
-	BoolMenuItem.hh IntMenuItem.hh \
-	MultiButtonMenuItem.hh MultiButtonMenuItem.cc \
-	MenuTheme.hh MenuTheme.cc NotCopyable.hh \
-	BorderTheme.hh BorderTheme.cc TextTheme.hh TextTheme.cc \
-	RefCount.hh SimpleCommand.hh \
-	TextUtils.hh TextUtils.cc Orientation.hh \
-	Texture.cc Texture.hh TextureRender.hh TextureRender.cc \
-	Shape.hh Shape.cc \
-	Theme.hh Theme.cc ThemeItems.cc Timer.hh Timer.cc \
-	FbTime.cc FbTime.hh \
-	XFontImp.cc XFontImp.hh \
-	Button.hh Button.cc \
-	TextButton.hh TextButton.cc \
-	Container.hh Container.cc \
-	MultLayers.cc MultLayers.hh \
-	Layer.cc Layer.hh LayerItem.cc LayerItem.hh \
-	Resource.hh Resource.cc \
-	StringUtil.hh StringUtil.cc Parser.hh Parser.cc \
-	RegExp.hh RegExp.cc \
-	FbString.hh FbString.cc \
-	AutoReloadHelper.hh AutoReloadHelper.cc \
-	Transparent.hh Transparent.cc \
-	FbPixmap.hh FbPixmap.cc \
-	FbDrawable.hh FbDrawable.cc \
-	XrmDatabaseHelper.hh \
-	Image.hh Image.cc \
-	PixmapWithMask.hh \
-	Compose.hh CompareEqual.hh \
-	TextBox.hh TextBox.cc \
-	GContext.hh GContext.cc \
-	KeyUtil.hh KeyUtil.cc \
-	MenuSeparator.hh MenuSeparator.cc \
-	stringstream.hh \
-	TypeAhead.hh SearchResult.hh SearchResult.cc ITypeAheadable.hh \
-	Select2nd.hh STLUtil.hh \
-	CachedPixmap.hh CachedPixmap.cc \
-	Slot.hh Signal.hh MemFun.hh SelectArg.hh \
-	Util.hh \
-	RelCalcHelper.hh RelCalcHelper.cc \
-	${xpm_SOURCE} \
-	${xft_SOURCE} \
-	${xmb_SOURCE} \
-	$(imlib2_SOURCE)

@@ -0,0 +1,162 @@ 
+noinst_LIBRARIES = libFbTk.a
+
+if XFT
+xft_SOURCE = \
+	src/FbTk/XftFontImp.hh \
+	src/FbTk/XftFontImp.cc
+endif
+
+if MULTIBYTE
+xmb_SOURCE = \
+	src/FbTk/XmbFontImp.hh \
+	src/FbTk/XmbFontImp.cc
+endif
+
+if XPM
+xpm_SOURCE = \
+	src/FbTk/ImageXPM.hh \
+	src/FbTk/ImageXPM.cc
+endif
+
+if IMLIB2
+imlib2_SOURCE = \
+	src/FbTk/ImageImlib2.hh \
+	src/FbTk/ImageImlib2.cc
+endif
+
+libFbTk_a_CPPFLAGS = \
+	$(FREETYPE2_CFLAGS) \
+	$(FRIBIDI_CFLAGS) \
+	$(AM_CPPFLAGS) \
+	-I$(src_incdir) \
+	-I$(nls_incdir)
+
+libFbTk_a_SOURCES = \
+	$(imlib2_SOURCE) \
+	${xft_SOURCE} \
+	${xmb_SOURCE} \
+	${xpm_SOURCE} \
+	src/FbTk/Accessor.hh \
+	src/FbTk/App.cc \
+	src/FbTk/App.hh \
+	src/FbTk/AutoReloadHelper.cc \
+	src/FbTk/AutoReloadHelper.hh \
+	src/FbTk/BoolMenuItem.hh \
+	src/FbTk/BorderTheme.cc \
+	src/FbTk/BorderTheme.hh \
+	src/FbTk/Button.cc \
+	src/FbTk/Button.hh \
+	src/FbTk/CachedPixmap.cc \
+	src/FbTk/CachedPixmap.hh \
+	src/FbTk/Color.cc \
+	src/FbTk/Color.hh \
+	src/FbTk/ColorLUT.cc \
+	src/FbTk/ColorLUT.hh \
+	src/FbTk/Command.hh \
+	src/FbTk/CommandParser.hh \
+	src/FbTk/CompareEqual.hh \
+	src/FbTk/Compose.hh \
+	src/FbTk/Container.cc \
+	src/FbTk/Container.hh \
+	src/FbTk/DefaultValue.hh \
+	src/FbTk/EventHandler.hh \
+	src/FbTk/EventManager.cc \
+	src/FbTk/EventManager.hh \
+	src/FbTk/FbDrawable.cc \
+	src/FbTk/FbDrawable.hh \
+	src/FbTk/FbPixmap.cc \
+	src/FbTk/FbPixmap.hh \
+	src/FbTk/FbString.cc \
+	src/FbTk/FbString.hh \
+	src/FbTk/FbTime.cc \
+	src/FbTk/FbTime.hh \
+	src/FbTk/FbWindow.cc \
+	src/FbTk/FbWindow.hh \
+	src/FbTk/FileUtil.cc \
+	src/FbTk/FileUtil.hh \
+	src/FbTk/Font.cc \
+	src/FbTk/Font.hh \
+	src/FbTk/FontImp.hh \
+	src/FbTk/GContext.cc \
+	src/FbTk/GContext.hh \
+	src/FbTk/I18n.cc \
+	src/FbTk/I18n.hh \
+	src/FbTk/ITypeAheadable.hh \
+	src/FbTk/Image.cc \
+	src/FbTk/Image.hh \
+	src/FbTk/ImageControl.cc \
+	src/FbTk/ImageControl.hh \
+	src/FbTk/IntMenuItem.hh \
+	src/FbTk/KeyUtil.cc \
+	src/FbTk/KeyUtil.hh \
+	src/FbTk/Layer.cc \
+	src/FbTk/Layer.hh \
+	src/FbTk/LayerItem.cc \
+	src/FbTk/LayerItem.hh \
+	src/FbTk/LogicCommands.cc \
+	src/FbTk/LogicCommands.hh \
+	src/FbTk/MacroCommand.cc \
+	src/FbTk/MacroCommand.hh \
+	src/FbTk/MemFun.hh \
+	src/FbTk/Menu.cc \
+	src/FbTk/Menu.hh \
+	src/FbTk/MenuItem.cc \
+	src/FbTk/MenuItem.hh \
+	src/FbTk/MenuSeparator.cc \
+	src/FbTk/MenuSeparator.hh \
+	src/FbTk/MenuTheme.cc \
+	src/FbTk/MenuTheme.hh \
+	src/FbTk/MultLayers.cc \
+	src/FbTk/MultLayers.hh \
+	src/FbTk/MultiButtonMenuItem.cc \
+	src/FbTk/MultiButtonMenuItem.hh \
+	src/FbTk/NotCopyable.hh \
+	src/FbTk/Orientation.hh \
+	src/FbTk/Parser.cc \
+	src/FbTk/Parser.hh \
+	src/FbTk/PixmapWithMask.hh \
+	src/FbTk/RadioMenuItem.hh \
+	src/FbTk/RefCount.hh \
+	src/FbTk/RegExp.cc \
+	src/FbTk/RegExp.hh \
+	src/FbTk/RelCalcHelper.cc \
+	src/FbTk/RelCalcHelper.hh \
+	src/FbTk/Resource.cc \
+	src/FbTk/Resource.hh \
+	src/FbTk/STLUtil.hh \
+	src/FbTk/SearchResult.cc \
+	src/FbTk/SearchResult.hh \
+	src/FbTk/Select2nd.hh \
+	src/FbTk/SelectArg.hh \
+	src/FbTk/Shape.cc \
+	src/FbTk/Shape.hh \
+	src/FbTk/Signal.hh \
+	src/FbTk/SimpleCommand.hh \
+	src/FbTk/Slot.hh \
+	src/FbTk/StringUtil.cc \
+	src/FbTk/StringUtil.hh \
+	src/FbTk/TextBox.cc \
+	src/FbTk/TextBox.hh \
+	src/FbTk/TextButton.cc \
+	src/FbTk/TextButton.hh \
+	src/FbTk/TextTheme.cc \
+	src/FbTk/TextTheme.hh \
+	src/FbTk/TextUtils.cc \
+	src/FbTk/TextUtils.hh \
+	src/FbTk/Texture.cc \
+	src/FbTk/Texture.hh \
+	src/FbTk/TextureRender.cc \
+	src/FbTk/TextureRender.hh \
+	src/FbTk/Theme.cc \
+	src/FbTk/Theme.hh \
+	src/FbTk/ThemeItems.cc \
+	src/FbTk/Timer.cc \
+	src/FbTk/Timer.hh \
+	src/FbTk/Transparent.cc \
+	src/FbTk/Transparent.hh \
+	src/FbTk/TypeAhead.hh \
+	src/FbTk/Util.hh \
+	src/FbTk/XFontImp.cc \
+	src/FbTk/XFontImp.hh \
+	src/FbTk/XrmDatabaseHelper.hh \
+	src/FbTk/stringstream.hh

@@ -22,16 +22,7 @@ // 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.
 
-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include "Menu.hh"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
 
 #include "MenuItem.hh"
 #include "MenuSeparator.hh"

@@ -22,11 +22,6 @@ // DEALINGS IN THE SOFTWARE.
 
 #include "RegExp.hh"
 
-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <iostream>
 
 using std::string;

@@ -26,10 +26,6 @@ #define FBTK_REGEXP_HH
 
 #include "NotCopyable.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <string>
 
 /*

@@ -26,10 +26,6 @@ #include "App.hh"
 #include "GContext.hh"
 #include "FbPixmap.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTRING
   #include <cstring>
 #else

@@ -24,10 +24,6 @@ 
 #ifndef THEMEITEMS_HH
 #define THEMEITEMS_HH
 
-#ifdef    HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "Theme.hh"
 #include "Color.hh"
 #include "Texture.hh"

@@ -27,11 +27,6 @@ 
 #include "CommandParser.hh"
 #include "StringUtil.hh"
 
-//use GNU extensions
-#ifndef	_GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #ifdef HAVE_CASSERT
   #include <cassert>
 #else

@@ -29,10 +29,6 @@ #include "RefCount.hh"
 #include "Command.hh"
 #include "FbTime.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #include <string>
 
 namespace FbTk {

@@ -23,10 +23,6 @@ #include "Transparent.hh"
 #include "App.hh"
 #include "I18n.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XRENDER
 #include <X11/extensions/Xrender.h>
 #endif // HAVE_XRENDER

@@ -27,10 +27,6 @@ #include <cmath>
 #include <cstdio>
 #include <algorithm>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 namespace FbTk {
 
 XftFontImp::XftFontImp(const char *name, bool utf8):

@@ -27,17 +27,9 @@ #include "StringUtil.hh"
 #include "FbPixmap.hh"
 #include "GContext.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #ifdef HAVE_SETLOCALE
 #include <locale.h>
 #endif // HAVE_SETLOCALE
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
 
 #ifdef HAVE_CSTDIO
   #include <cstdio>

@@ -22,10 +22,6 @@ 
 #ifndef FBTK_STRINGSTREAM_HH
 #define FBTK_STRINGSTREAM_HH
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_SSTREAM
 #include <sstream>
 #define FbTk_istringstream std::istringstream

@@ -32,10 +32,6 @@ #include "FbTk/EventManager.hh"
 #include "FbTk/ImageControl.hh"
 #include "FbTk/TextUtils.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #ifdef SHAPE
 #include <X11/extensions/shape.h>

@@ -40,11 +40,6 @@ #include "FbTk/I18n.hh"
 #include "FbTk/AutoReloadHelper.hh"
 #include "FbTk/STLUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_CCTYPE
   #include <cctype>
 #else

@@ -1,183 +0,0 @@ 
-# Makefile.am for fluxbox
-# Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
-#
-# src/Makefile.am for Blackbox 0.61.x  - an X11 Window manager
-# Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
-#
-# 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.
-
-
-if TEST
-BUILD_TEST= tests
-endif
-SUBDIRS= FbTk $(BUILD_TEST)
-
-DEFAULT_MENU=@DEFAULT_MENU@
-DEFAULT_STYLE=@DEFAULT_STYLE@
-DEFAULT_KEYSFILE=@DEFAULT_KEYS@
-DEFAULT_APPSFILE=@DEFAULT_APPS@
-DEFAULT_OVERLAY=@DEFAULT_OVERLAY@
-DEFAULT_INITFILE=@DEFAULT_INIT@
-DEFAULT_WINDOWMENU=@DEFAULT_WINDOWMENU@
-PROGRAM_PREFIX=@program_prefix@
-PROGRAM_SUFFIX=@program_suffix@
-
-AM_CPPFLAGS=
-
-bin_PROGRAMS= fluxbox
-BUILT_SOURCES = defaults.hh defaults.cc
-CONFIG_CLEAN_FILES = defaults.hh defaults.cc
-defaults.hh: Makefile
-	@( \
-		echo '// This file is generated from Makefile. Do not edit!'; \
-		echo '#include <string>'; \
-		echo ''; \
-		echo '#ifdef _WIN32'; \
-		echo '#define DUMMYPREFIX "/DUMMYPREFIX"'; \
-		echo '#define PATHPREFIX DUMMYPREFIX'; \
-		echo '#else'; \
-		echo '#define PATHPREFIX'; \
-		echo '#endif'; \
-		echo '#define CONFIG_VERSION 13'; \
-		echo '#define DEFAULTMENU PATHPREFIX "$(DEFAULT_MENU)"'; \
-		echo '#define DEFAULTSTYLE PATHPREFIX "$(DEFAULT_STYLE)"'; \
-		echo '#define DEFAULTKEYSFILE PATHPREFIX "$(DEFAULT_KEYSFILE)"'; \
-		echo '#define DEFAULT_APPSFILE PATHPREFIX "$(DEFAULT_APPSFILE)"'; \
-		echo '#define DEFAULT_OVERLAY PATHPREFIX "$(DEFAULT_OVERLAY)"'; \
-		echo '#define DEFAULT_INITFILE PATHPREFIX "$(DEFAULT_INITFILE)"'; \
-		echo '#define DEFAULT_WINDOWMENU PATHPREFIX "$(DEFAULT_WINDOWMENU)"'; \
-		echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \
-		echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \
-		echo 'std::string realProgramName(const std::string& name);'; \
-		echo 'const char* gitrevision();' ) > defaults.hh
-
-defaults.cc: force
-	@( \
-		GITDIR=$(top_srcdir)/.git; \
-		echo '// This file is generated from Makefile. Do not edit!'; \
-		echo '#include "defaults.hh"'; \
-		echo ''; \
-		echo 'std::string realProgramName(const std::string& name) {'; \
-		echo '  return PROGRAM_PREFIX + name + PROGRAM_SUFFIX;'; \
-		echo '}'; \
-		echo ''; \
-		echo 'const char* gitrevision() {'; \
-		if test -r $$GITDIR/HEAD; then \
-			echo '  return "'`cat $$GITDIR/$$(cat $$GITDIR/HEAD | cut -f 2 -d ' ')`'";'; \
-		else \
-			echo '  return "this_is_tar_ball_build";'; \
-		fi; \
-		echo '}' ) > defaults_tmp.cc
-	@if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi
-	@rm defaults_tmp.cc
-
-force: ;
-
-# an extra dep for fluxbox
-fluxbox.$(OBJEXT): defaults.hh
-
-
-
-if EWMH
-EWMH_SOURCE= Ewmh.hh Ewmh.cc
-endif
-if REMEMBER_SRC
-REMEMBER_SOURCE= Remember.hh Remember.cc
-endif
-if TOOLBAR_SRC
-TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \
-	ToolbarTheme.hh ToolbarTheme.cc ToolbarItem.hh ToolbarItem.cc \
-	ClockTool.hh ClockTool.cc \
-	WorkspaceNameTool.hh WorkspaceNameTool.cc WorkspaceNameTheme.hh \
-	IconbarTool.hh IconbarTool.cc \
-	ToolTheme.hh ToolTheme.cc \
-	GenericTool.hh GenericTool.cc \
-	ButtonTool.hh ButtonTool.cc ButtonTheme.hh ButtonTheme.cc \
-	ToolFactory.hh ToolFactory.cc
-if SYSTRAY_SRC
-TOOLBAR_SOURCE += SystemTray.hh SystemTray.cc
-endif
-endif
-
-
-if SLIT_SRC
-SLIT_SOURCE = Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc
-endif
-
-fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
-	FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \
-	FbWinFrameTheme.hh FbWinFrameTheme.cc \
-	fluxbox.cc fluxbox.hh \
-	Keys.cc Keys.hh \
-	main.cc \
-	cli.hh cli_cfiles.cc cli_options.cc cli_info.cc \
-	RootTheme.hh RootTheme.cc \
-	FbRootWindow.hh FbRootWindow.cc \
-	OSDWindow.hh OSDWindow.cc \
-	TooltipWindow.hh TooltipWindow.cc \
-	Screen.cc Screen.hh \
-	WinButton.hh WinButton.cc \
-	WinButtonTheme.hh WinButtonTheme.cc \
-	Window.cc Window.hh WindowState.cc WindowState.hh\
-	Workspace.cc Workspace.hh \
-	FbCommands.hh FbCommands.cc LayerMenu.hh LayerMenu.cc \
-	Layer.hh \
-	FbMenu.hh FbMenu.cc \
-	WinClient.hh WinClient.cc \
-	Strut.hh \
-	Xinerama.hh \
-	Xutil.hh Xutil.cc \
-	CurrentWindowCmd.hh CurrentWindowCmd.cc \
-	WorkspaceCmd.hh WorkspaceCmd.cc \
-	TextDialog.hh TextDialog.cc \
-	CommandDialog.hh CommandDialog.cc SendToMenu.hh SendToMenu.cc \
-	AlphaMenu.hh AlphaMenu.cc \
-	FbMenuParser.hh FbMenuParser.cc \
-	StyleMenuItem.hh StyleMenuItem.cc \
-	RootCmdMenuItem.hh RootCmdMenuItem.cc\
-	MenuCreator.hh MenuCreator.cc \
-	ClientMenu.hh ClientMenu.cc \
-	ClientPattern.hh ClientPattern.cc \
-	WorkspaceMenu.hh WorkspaceMenu.cc \
-	FocusModelMenuItem.hh \
-	ToggleMenu.hh \
-	HeadArea.hh HeadArea.cc \
-	Resources.cc \
-	WindowCmd.hh WindowCmd.cc \
-	FocusControl.hh FocusControl.cc \
-	PlacementStrategy.hh \
-	CascadePlacement.hh CascadePlacement.cc \
-	ColSmartPlacement.hh ColSmartPlacement.cc \
-	MinOverlapPlacement.hh MinOverlapPlacement.cc \
-	RowSmartPlacement.hh RowSmartPlacement.cc \
-	ScreenPlacement.hh ScreenPlacement.cc \
-	UnderMousePlacement.hh UnderMousePlacement.cc \
-	AttentionNoticeHandler.hh AttentionNoticeHandler.cc \
-	IconButton.hh IconButton.cc \
-	IconbarTheme.hh IconbarTheme.cc \
-	Focusable.hh FocusableList.hh FocusableList.cc FocusableTheme.hh \
-	WindowMenuAccessor.hh \
-	RectangleUtil.hh \
-	Debug.hh \
-	${EWMH_SOURCE} \
-	${REMEMBER_SOURCE} \
-	${SLIT_SOURCE} \
-	${TOOLBAR_SOURCE}
-
-LDADD=FbTk/libFbTk.a defaults.$(OBJEXT)

@@ -0,0 +1,275 @@ 
+# Makefile.am for fluxbox
+# Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+#
+# src/Makefile.am for Blackbox 0.61.x  - an X11 Window manager
+# Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
+#
+# 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.
+
+BUILT_SOURCES = src/defaults.hh src/defaults.cc
+CONFIG_CLEAN_FILES = src/defaults.hh src/defaults.cc
+
+bin_PROGRAMS += fluxbox
+
+src/defaults.hh:
+	@( \
+		echo '// This file is generated from Makefile. Do not edit!'; \
+		echo '#include <string>'; \
+		echo ''; \
+		echo '#ifdef _WIN32'; \
+		echo '#define DUMMYPREFIX "/DUMMYPREFIX"'; \
+		echo '#define PATHPREFIX DUMMYPREFIX'; \
+		echo '#else'; \
+		echo '#define PATHPREFIX'; \
+		echo '#endif'; \
+		echo '#define CONFIG_VERSION 13'; \
+		echo '#define DEFAULTMENU PATHPREFIX "$(DEFAULT_MENU)"'; \
+		echo '#define DEFAULTSTYLE PATHPREFIX "$(DEFAULT_STYLE)"'; \
+		echo '#define DEFAULTKEYSFILE PATHPREFIX "$(DEFAULT_KEYSFILE)"'; \
+		echo '#define DEFAULT_APPSFILE PATHPREFIX "$(DEFAULT_APPSFILE)"'; \
+		echo '#define DEFAULT_OVERLAY PATHPREFIX "$(DEFAULT_OVERLAY)"'; \
+		echo '#define DEFAULT_INITFILE PATHPREFIX "$(DEFAULT_INITFILE)"'; \
+		echo '#define DEFAULT_WINDOWMENU PATHPREFIX "$(DEFAULT_WINDOWMENU)"'; \
+		echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \
+		echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \
+		echo 'std::string realProgramName(const std::string& name);'; \
+		echo 'const char* gitrevision();' ) > $(top_builddir)/src/defaults.hh
+
+src/defaults.cc: force
+	@( \
+		GITDIR=$(top_srcdir)/.git; \
+		echo '// This file is generated from Makefile. Do not edit!'; \
+		echo '#include "defaults.hh"'; \
+		echo ''; \
+		echo 'std::string realProgramName(const std::string& name) {'; \
+		echo '  return PROGRAM_PREFIX + name + PROGRAM_SUFFIX;'; \
+		echo '}'; \
+		echo ''; \
+		echo 'const char* gitrevision() {'; \
+		if test -r $$GITDIR/HEAD; then \
+			echo '  return "'`cat $$GITDIR/$$(cat $$GITDIR/HEAD | cut -f 2 -d ' ')`'";'; \
+		else \
+			echo '  return "this_is_tar_ball_build";'; \
+		fi; \
+		echo '}' ) > $(top_builddir)/src/defaults_tmp.cc
+	@if ! cmp defaults_tmp.cc defaults.cc ; then cp $(top_builddir)/src/defaults_tmp.cc $(top_builddir)/src/defaults.cc; fi
+	@rm $(top_builddir)/src/defaults_tmp.cc
+
+force: ;
+
+# an extra dep for fluxbox
+fluxbox.$(OBJEXT): src/defaults.hh
+
+if EWMH
+EWMH_SOURCE = \
+	src/Ewmh.hh \
+	src/Ewmh.cc
+endif
+
+if REMEMBER_SRC
+REMEMBER_SOURCE = \
+	src/Remember.hh \
+	src/Remember.cc
+endif
+
+if TOOLBAR_SRC
+TOOLBAR_SOURCE = \
+	src/ButtonTheme.cc \
+	src/ButtonTheme.hh \
+	src/ButtonTool.cc \
+	src/ButtonTool.hh \
+	src/ClockTool.cc \
+	src/ClockTool.hh \
+	src/GenericTool.cc \
+	src/GenericTool.hh \
+	src/IconbarTool.cc \
+	src/IconbarTool.hh \
+	src/ToolFactory.cc \
+	src/ToolFactory.hh \
+	src/ToolTheme.cc \
+	src/ToolTheme.hh \
+	src/Toolbar.cc \
+	src/Toolbar.hh \
+	src/ToolbarItem.cc \
+	src/ToolbarItem.hh \
+	src/ToolbarTheme.cc \
+	src/ToolbarTheme.hh \
+	src/WorkspaceNameTheme.hh \
+	src/WorkspaceNameTool.cc \
+	src/WorkspaceNameTool.hh
+if SYSTRAY_SRC
+TOOLBAR_SOURCE += \
+	src/SystemTray.cc \
+	src/SystemTray.hh
+endif
+endif
+
+if SLIT_SRC
+SLIT_SOURCE = \
+	src/Slit.cc \
+	src/Slit.hh \
+	src/SlitClient.cc \
+	src/SlitClient.hh \
+	src/SlitTheme.cc \
+	src/SlitTheme.hh
+endif
+
+fluxbox_CPPFLAGS = \
+	$(FRIBIDI_CFLAGS) \
+	$(XRANDR_CFLAGS) \
+	$(AM_CPPFLAGS) \
+	-I$(src_incdir) \
+	-I$(fbtk_incdir) \
+	-I$(nls_incdir)
+
+fluxbox_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FREETYPE2_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(IMLIB2_LIBS) \
+	$(RANDR_LIBS) \
+	$(X11_LIBS) \
+	$(XEXT_LIBS) \
+	$(XFT_LIBS) \
+	$(XINERAMA_LIBS) \
+	$(XPM_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_EXTRA_LIBS) \
+	$(X_LIBS) \
+	$(X_PRE_LIBS)
+
+fluxbox_SOURCES = \
+	src/AlphaMenu.cc \
+	src/AlphaMenu.hh \
+	src/ArrowButton.cc \
+	src/ArrowButton.hh \
+	src/AtomHandler.hh \
+	src/AttentionNoticeHandler.cc \
+	src/AttentionNoticeHandler.hh \
+	src/CascadePlacement.cc \
+	src/CascadePlacement.hh \
+	src/ClientMenu.cc \
+	src/ClientMenu.hh \
+	src/ClientPattern.cc \
+	src/ClientPattern.hh \
+	src/ColSmartPlacement.cc \
+	src/ColSmartPlacement.hh \
+	src/CommandDialog.cc \
+	src/CommandDialog.hh \
+	src/CurrentWindowCmd.cc \
+	src/CurrentWindowCmd.hh \
+	src/Debug.hh \
+	src/FbAtoms.cc \
+	src/FbAtoms.hh \
+	src/FbCommands.cc \
+	src/FbCommands.hh \
+	src/FbMenu.cc \
+	src/FbMenu.hh \
+	src/FbMenuParser.cc \
+	src/FbMenuParser.hh \
+	src/FbRootWindow.cc \
+	src/FbRootWindow.hh \
+	src/FbWinFrame.cc \
+	src/FbWinFrame.hh \
+	src/FbWinFrameTheme.cc \
+	src/FbWinFrameTheme.hh \
+	src/FocusControl.cc \
+	src/FocusControl.hh \
+	src/FocusModelMenuItem.hh \
+	src/Focusable.hh \
+	src/FocusableList.cc \
+	src/FocusableList.hh \
+	src/FocusableTheme.hh \
+	src/HeadArea.cc \
+	src/HeadArea.hh \
+	src/IconButton.cc \
+	src/IconButton.hh \
+	src/IconbarTheme.cc \
+	src/IconbarTheme.hh \
+	src/Keys.cc \
+	src/Keys.hh \
+	src/Layer.hh \
+	src/LayerMenu.cc \
+	src/LayerMenu.hh \
+	src/MenuCreator.cc \
+	src/MenuCreator.hh \
+	src/MinOverlapPlacement.cc \
+	src/MinOverlapPlacement.hh \
+	src/OSDWindow.cc \
+	src/OSDWindow.hh \
+	src/PlacementStrategy.hh \
+	src/RectangleUtil.hh \
+	src/Resources.cc \
+	src/RootCmdMenuItem.cc\
+	src/RootCmdMenuItem.hh \
+	src/RootTheme.cc \
+	src/RootTheme.hh \
+	src/RowSmartPlacement.cc \
+	src/RowSmartPlacement.hh \
+	src/Screen.cc \
+	src/Screen.hh \
+	src/ScreenPlacement.cc \
+	src/ScreenPlacement.hh \
+	src/SendToMenu.cc \
+	src/SendToMenu.hh \
+	src/Strut.hh \
+	src/StyleMenuItem.cc \
+	src/StyleMenuItem.hh \
+	src/TextDialog.cc \
+	src/TextDialog.hh \
+	src/ToggleMenu.hh \
+	src/TooltipWindow.cc \
+	src/TooltipWindow.hh \
+	src/UnderMousePlacement.cc \
+	src/UnderMousePlacement.hh \
+	src/WinButton.cc \
+	src/WinButton.hh \
+	src/WinButtonTheme.cc \
+	src/WinButtonTheme.hh \
+	src/WinClient.cc \
+	src/WinClient.hh \
+	src/Window.cc \
+	src/Window.hh \
+	src/WindowCmd.cc \
+	src/WindowCmd.hh \
+	src/WindowMenuAccessor.hh \
+	src/WindowState.cc \
+	src/WindowState.hh\
+	src/Workspace.cc \
+	src/Workspace.hh \
+	src/WorkspaceCmd.cc \
+	src/WorkspaceCmd.hh \
+	src/WorkspaceMenu.cc \
+	src/WorkspaceMenu.hh \
+	src/Xinerama.hh \
+	src/Xutil.cc \
+	src/Xutil.hh \
+	src/fluxbox.cc \
+	src/fluxbox.hh \
+	src/main.cc \
+	src/cli.hh \
+	src/cli_cfiles.cc \
+	src/cli_options.cc \
+	src/cli_info.cc \
+	${EWMH_SOURCE} \
+	${REMEMBER_SOURCE} \
+	${SLIT_SOURCE} \
+	${TOOLBAR_SOURCE}
+
+LDADD = libFbTk.a src/defaults.$(OBJEXT)

@@ -49,11 +49,6 @@ #else
   #include <string.h>
 #endif
 
-//use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <set>
 
 

@@ -77,15 +77,6 @@ #include "FbTk/STLUtil.hh"
 #include "FbTk/KeyUtil.hh"
 #include "FbTk/Util.hh"
 
-//use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef USE_SLIT
 #include "Slit.hh"
 #include "SlitClient.hh"
@@ -401,21 +392,18 @@ }
 
 
 // setup RANDR for this screens root window
-#if defined(HAVE_RANDR1_2)
+#if defined(HAVE_RANDR)
     int randr_mask = RRScreenChangeNotifyMask;
-#ifdef RRCrtcChangeNotifyMask
+# ifdef RRCrtcChangeNotifyMask
     randr_mask |= RRCrtcChangeNotifyMask;
-#endif
-#ifdef RROutputChangeNotifyMask
+# endif
+# ifdef RROutputChangeNotifyMask
     randr_mask |= RROutputChangeNotifyMask;
-#endif
-#ifdef RROutputPropertyNotifyMask
+# endif
+# ifdef RROutputPropertyNotifyMask
     randr_mask |= RROutputPropertyNotifyMask;
-#endif
+# endif
     XRRSelectInput(disp, rootWindow().window(), randr_mask);
-
-#elif defined(HAVE_RANDR)
-    XRRScreenChangeSelectInput(disp, rootWindow().window(), True);
 #endif // HAVE_RANDR
 
 

@@ -24,15 +24,6 @@ // DEALINGS IN THE SOFTWARE.
 
 #include "Slit.hh"
 
-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "Screen.hh"
 #include "ScreenPlacement.hh"
 #include "FbTk/ImageControl.hh"

@@ -55,15 +55,6 @@ #include "FbTk/MemFun.hh"
 #include "FbTk/STLUtil.hh"
 #include "FbTk/Util.hh"
 
-// use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 

@@ -55,17 +55,9 @@ #include "FbTk/SimpleCommand.hh"
 #include "FbTk/Select2nd.hh"
 #include "FbTk/MemFun.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
 #ifdef SHAPE
 #include <X11/extensions/shape.h>
 #endif // SHAPE
-
-//use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
 
 #include <X11/Xatom.h>
 #include <X11/keysym.h>

@@ -23,10 +23,6 @@ #include "WindowState.hh"
 
 #include "FbTk/StringUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTDLIB
   #include <cstdlib>
 #else

@@ -36,15 +36,6 @@ #include "FbTk/StringUtil.hh"
 #include "FbTk/FbString.hh"
 #include "FbTk/MemFun.hh"
 
-// use GNU extensions
-#ifndef  _GNU_SOURCE
-#define  _GNU_SOURCE
-#endif // _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 

@@ -28,10 +28,6 @@ #include "FbTk/I18n.hh"
 #include "FbTk/Resource.hh"
 #include "FbTk/StringUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTRING
   #include <cstring>
 #else

@@ -57,15 +57,6 @@ #include "FbTk/Compose.hh"
 #include "FbTk/KeyUtil.hh"
 #include "FbTk/MemFun.hh"
 
-//Use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef USE_EWMH
 #include "Ewmh.hh"
 #endif // USE_EWMH

@@ -20,10 +20,6 @@ // 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.
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "fluxbox.hh"
 #include "version.h"
 #include "defaults.hh"
@@ -36,6 +32,18 @@ //use GNU extensions
 #ifndef	 _GNU_SOURCE
 #define	 _GNU_SOURCE
 #endif // _GNU_SOURCE
+
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 #ifdef HAVE_UNISTD_H
   #include <unistd.h>

@@ -1,22 +0,0 @@ 
-AM_CPPFLAGS= -I$(top_srcdir)/src
-
-noinst_PROGRAMS= \
-	 testTexture \
-	 testFont \
-	 testKeys \
-	 testDemandAttention \
-	 testFullscreen \
-	 testStringUtil \
-	 testRectangleUtil
-
-testTexture_SOURCES         = texturetest.cc
-testFont_SOURCES            = testFont.cc
-testKeys_SOURCES            = testKeys.cc
-testDemandAttention_SOURCES = testDemandAttention.cc
-#testResource_SOURCES        = Resourcetest.cc
-testFullscreen_SOURCES      = fullscreentest.cc
-testStringUtil_SOURCES      = StringUtiltest.cc
-testRectangleUtil_SOURCES   = testRectangleUtil.cc
-
-LDADD=../FbTk/libFbTk.a
-

@@ -0,0 +1,104 @@ 
+check_PROGRAMS= \
+	testDemandAttention \
+	testFont \
+	testFullscreen \
+	testKeys \
+	testRectangleUtil \
+	testSignals \
+	testStringUtil \
+	testTexture
+
+testDemandAttention_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testDemandAttention_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+testDemandAttention_SOURCES = \
+	src/tests/testDemandAttention.cc
+
+testFont_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testFont_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+testFont_SOURCES = \
+	src/tests/testFont.cc
+
+testFullscreen_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testFullscreen_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir) \
+	-I$(src_incdir)
+testFullscreen_SOURCES = \
+	src/tests/fullscreentest.cc
+
+testKeys_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testKeys_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+testKeys_SOURCES = \
+	src/tests/testKeys.cc
+
+testRectangleUtil_SOURCES = \
+	src/RectangleUtil.hh \
+	src/tests/testRectangleUtil.cc
+testRectangleUtil_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir)/src
+
+testSignals_LDFLAGS = \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+
+testSignals_SOURCES = \
+	src/tests/testSignals.cc
+testSignals_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+
+testStringUtil_SOURCES = \
+	src/tests/StringUtiltest.cc
+testStringUtil_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+
+testTexture_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(IMLIB2_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XPM_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testTexture_SOURCES = \
+	src/tests/texturetest.cc
+testTexture_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+
+#testResource_SOURCE = Resourcetest.cc

@@ -21,11 +21,6 @@ // DEALINGS IN THE SOFTWARE.
 
 #include "Resource.hh"
 
-//use of strcasecmp 
-#ifndef   _GNU_SOURCE
-#define   _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <string>
 #include <iostream>
 #ifdef HAVE_CSTDIO

@@ -20,9 +20,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
 #include "FbTk/StringUtil.hh"
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif //_GNU_SOURCE
 
 #include <cstring>
 #include <cstdlib>

@@ -1,1 +0,0 @@ 
-timestamp

@@ -1,59 +0,0 @@ 
-# util/Makefile.am for Fluxbox
-SUBDIRS=		fbrun
-AM_CPPFLAGS= 		-I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
-bin_SCRIPTS= 		fbsetbg fluxbox-generate_menu startfluxbox
-bin_PROGRAMS=		fbsetroot fluxbox-update_configs fluxbox-remote
-fbsetroot_SOURCES=	fbsetroot.cc fbsetroot.hh
-fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \
-			../src/FbTk/libFbTk.a
-fluxbox_update_configs_SOURCES=	fluxbox-update_configs.cc
-fluxbox_update_configs_LDADD=	../src/defaults.o ../src/Resources.o \
-			../src/FbTk/libFbTk.a
-fluxbox_remote_SOURCES=	fluxbox-remote.cc
-
-MAINTAINERCLEANFILES=	Makefile.in
-EXTRA_DIST=		fbsetbg fluxbox-generate_menu.in \
-				startfluxbox.in
-
-PROGRAM_PREFIX=@program_prefix@
-PROGRAM_SUFFIX=@program_suffix@
-
-all-local:	startfluxbox
-
-clean-local:
-		rm -f startfluxbox fluxbox-generate_menu
-
-fbsetroot.o: 	fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \
-			$(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
-
-fluxbox-update_configs.o:	fluxbox-update_configs.cc ../config.h \
-			$(top_builddir)/src/defaults.hh
-
-fluxbox-remote.o:	fluxbox-remote.cc
-
-startfluxbox: 	startfluxbox.in
-		@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
-		            -e "s,@pkgbindir@,$(bindir),g" \
-		            -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-		            -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-		            -e "s,@EXEEXT@,$(EXEEXT),g" \
-				$(srcdir)/startfluxbox.in > startfluxbox
-		-chmod 755 startfluxbox
-
-fluxbox-generate_menu: fluxbox-generate_menu.in
-		@regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \
-		            -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-		            -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-		            -e "s,@EXEEXT@,$(EXEEXT),g" \
-				$(srcdir)/fluxbox-generate_menu.in \
-				> fluxbox-generate_menu
-		-chmod 755 fluxbox-generate_menu
-
-../src/FbRootWindow.o:
-	cd ../src && ${MAKE} FbRootWindow.o
-../src/FbAtoms.o:
-	cd ../src && ${MAKE} FbAtoms.o
-../src/defaults.o:
-	cd ../src && ${MAKE} defaults.o
-../src/Resources.o:
-	cd ../src && ${MAKE} Resources.o

@@ -0,0 +1,58 @@ 
+# util/Makefile.am for Fluxbox
+
+bin_SCRIPTS = \
+	util/fbsetbg \
+	util/fluxbox-generate_menu \
+	util/startfluxbox
+EXTRA_DIST += \
+	util/fbsetbg
+PATHFILES += \
+	util/startfluxbox \
+	util/fluxbox-generate_menu
+
+bin_PROGRAMS += \
+	fbsetroot \
+	fluxbox-remote \
+	fluxbox-update_configs
+
+fbsetroot_SOURCES = \
+	src/FbAtoms.cc \
+	src/FbRootWindow.cc \
+	util/fbsetroot.cc \
+	util/fbsetroot.hh
+fbsetroot_LDADD = \
+	libFbTk.a
+fbsetroot_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir) \
+	-I$(src_incdir) \
+	-I$(nls_incdir)
+fbsetroot_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS)
+
+fluxbox_update_configs_SOURCES = \
+	src/defaults.cc \
+	src/Resources.cc \
+	util/fluxbox-update_configs.cc
+fluxbox_update_configs_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir) \
+	-I$(src_incdir) \
+	-I$(nls_incdir)
+fluxbox_update_configs_LDADD = \
+	libFbTk.a
+fluxbox_update_configs_LDFLAGS = \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS)
+
+fluxbox_remote_SOURCES = \
+	util/fluxbox-remote.cc
+fluxbox_remote_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+fluxbox_remote_LDFLAGS = \
+	$(X11_LIBS)

@@ -27,10 +27,6 @@ #include "FbTk/Color.hh"
 #include "FbTk/KeyUtil.hh"
 #include "FbTk/FileUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XPM
 #include <X11/xpm.h>
 #include "fbrun.xpm"

@@ -1,8 +0,0 @@ 
-FLUXBOX_SRC_DIR=	../../src/
-AM_CPPFLAGS= 		-I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
-bin_PROGRAMS= 		fbrun
-fbrun_SOURCES= 		FbRun.hh FbRun.cc main.cc fbrun.xpm
-fbrun_LDADD=		${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
-
-${FLUXBOX_SRC_DIR}FbTk/libFbTk.a:
-	cd ${FLUXBOX_SRC_DIR}FbTk && make

@@ -0,0 +1,22 @@ 
+bin_PROGRAMS += fbrun
+
+fbrun_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(src_incdir)
+
+fbrun_SOURCES = \
+	util/fbrun/FbRun.hh \
+	util/fbrun/FbRun.cc \
+	util/fbrun/main.cc \
+	util/fbrun/fbrun.xpm
+
+fbrun_LDADD = libFbTk.a
+
+fbrun_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XINERAMA_LIBS) \
+	$(XPM_LIBS) \
+	$(XRENDER_LIBS)

@@ -26,10 +26,6 @@ #include "../src/FbTk/Texture.hh"
 #include "../src/FbTk/GContext.hh"
 #include "../src/FbRootWindow.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xatom.h>
 
 #ifdef HAVE_CSTRING

@@ -26,18 +26,9 @@ #include "../src/FbTk/FileUtil.hh"
 
 #include "../src/defaults.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif // HAVE_SIGNAL_H
-
-//use GNU extensions
-#ifndef         _GNU_SOURCE
-#define         _GNU_SOURCE
-#endif // _GNU_SOURCE
 
 #ifdef HAVE_CSTRING
   #include <cstring>