Update to xorg-macros 1.19.0

5 files changed, 335 insertions, 41 deletions

diff --git a/util/macros/ChangeLog b/util/macros/ChangeLog
index 600f7b2c9..af075afca 100644
--- a/util/macros/ChangeLog
+++ b/util/macros/ChangeLog
@@ -1,3 +1,175 @@
+commit 9a54b858601bd305de2737b06e609084a2a114c2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Mar 27 09:10:01 2014 -0400
+
+    Version bump: 1.19.0
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0677da7ed48f74a54f9bfd12afea7f0d578d7d38
+Author: Hans de Goede <hdegoede@redhat.com>
+Date:   Thu Mar 27 12:45:43 2014 +0100
+
+    XORG_PROG_RAWCPP: Add TRADITIONALCPPFLAGS
+    
+    In some cases we may want to have -traditional for proper whitespace preserving
+    without -undef, as we actually want the system definitions to be in place
+    so we can #ifdef on them. IE in xinit various .cpp files contain things like
+     #ifdef __APPLE__ and #ifdef __linux__
+    
+    So this patch adds a TRADITIONALCPPFLAGS variable which contains just
+    -traditional where applicable without the other RAWCPPFLAGS for unsetting
+    the system definitions.
+    
+    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+    Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 6768f12b4db660bb691337c6d238a32aae0475ff
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Mar 27 08:21:51 2014 -0400
+
+    Provide the automake INSTALL file at level 1.11
+    
+    Now that the minimum level for automake is 1.11, replace the current
+    INSTALL with the one from automake 1.11.
+    
+    Recall that the file in this package is installed in $pkgdatadir
+    and is copied by each xorg module through the make 'dist' target.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 7acde944f40dad08fa8c43bc2548205e343afcd1
+Author: Arnaud Fontaine <arnau@debian.org>
+Date:   Sat Feb 8 10:31:39 2014 -0500
+
+    Add XORG_WITH_M4 macro
+    
+    Originally from XCB, this macro checks for the presence of m4 or gm4
+    which supports -I dir.
+    
+    The AC_PATH_PROGS_FEATURE_CHECK autoconf macro requires autoconf 2.62.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit a5092b6a9931c8a60813f4f8a038cc5d9771d212
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Feb 6 17:47:20 2014 -0500
+
+    Bump minimum Autoconf required version to 2.62
+    
+    The main motivation is to catch-up with the development reality and
+    allow use of features in Autoconf 2.62 as well as Automake 1.11.
+    
+    As usual this means no features found only in versions above those
+    specified are allowed.
+    
+    This is implementing the policy change which is described in:
+    http://www.x.org/wiki/Building_the_X_Window_System/?updated#index2h3
+    
+    Discussion on xorg minimum autotools requirements:
+    http://lists.x.org/archives/xorg-devel/2013-October/038325.html
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 72b211419977a211c871232d66e1a668e3cf702f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Mon Dec 2 16:41:45 2013 -0800
+
+    XORG_COMPILER_FLAGS: Add -Wlogical-op to default warning set
+    
+    We've fixed several bugs it uncovered already, only one warning left that
+    it adds in a default build.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9bc8e154e53ee0ff8d09cc621ba762486f3e93fa
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Dec 2 18:43:36 2013 -0500
+
+    Version bump: 1.18.0
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit fae36763f91f38dc9c4c388f267532889bb428ff
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Dec 2 18:12:39 2013 -0500
+
+    XORG_TESTSET_CFLAG: add -fd which is the SUNCC -Wold-style-definition
+    
+    Seen in the XCB configuration and found missing in xorg.
+    
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 71dc85d04b67dc9579de47ec9e51c3ae6dde91ce
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Dec 1 17:05:47 2013 -0500
+
+    XORG_WITH_DOXYGEN: check for the dot graphics utility
+    
+    It is part of the graphviz package and it may be used by doxygen if
+    the HAVE_DOT is set to "yes" in the doxygen configuration file.
+    
+    The calling module handles if the tool is mandatory or not.
+    Doxygen will work fine without it, but no fancy graphics.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4846869cce5aafb0d2d2980f508ae320b599ac92
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Dec 1 10:07:50 2013 -0500
+
+    CWARNFLAGS: comment out -Wcast-qual
+    
+    On a full X build, this warning accounts for the 5,888 warnings on a total
+    of 12,042. The line is moved to the "noisy" section of warnings.
+    
+    There is a discussion about the pros and cons here:
+    http://lists.x.org/archives/xorg-devel/2013-November/039069.html
+    
+    Reviewed-by: Keith Packard <keithp@keithp.com>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 72fdc868b56fe2b7bdc9a69872651baeca728fb6
+Author: Ross Burton <ross.burton@intel.com>
+Date:   Thu Oct 10 17:23:04 2013 +0100
+
+    xorg-macros.m4.in: use the autoconf cache for XORG_CHECK_MALLOC_ZERO
+    
+    Improve configure speed by checking the autoconf cache before compiling and
+    running the test.
+    
+    As this means cross-compilation environments can trivially seed this cache as
+    appropriate, remove the cross-compiling value (which for embedded systems using
+    uclibc is wrong).
+    
+    Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+    Signed-off-by: Ross Burton <ross.burton@intel.com>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 52ed34418492c1538b8022a830a79fbc50ba3605
+Author: Bart Massey <bart@cs.pdx.edu>
+Date:   Thu Sep 12 01:33:25 2013 -0700
+
+    Revert "Interleaved C code and declarations is no longer a portability issue."
+    
+    This reverts commit 689ea0ec5d8b7594ba2fa9e27b2458cea8a58724.
+    
+    Community consensus is that, while this style is no longer a
+    portability issue, it's a style issue.
+
+commit 689ea0ec5d8b7594ba2fa9e27b2458cea8a58724
+Author: Arnaud Fontaine <arnau@debian.org>
+Date:   Thu Aug 29 11:06:14 2013 +0900
+
+    Interleaved C code and declarations is no longer a portability issue.
+    
+    This was only supported from GCC 3.0 and OpenBSD was still using GCC 2.95
+    until recently.
+    
+    Signed-off-by: Arnaud Fontaine <arnau@debian.org>
+
 commit 052fa1dc1779de34ba69f68b7dc32b3c733c823e
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Sep 6 23:34:33 2013 -0700
diff --git a/util/macros/INSTALL b/util/macros/INSTALL
index 8b82ade08..a1e89e18a 100644
--- a/util/macros/INSTALL
+++ b/util/macros/INSTALL
@@ -1,11 +1,13 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@ Basic Installation
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@ may remove or edit it.
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@ The simplest way to compile this package is:
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@ Installation Names
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -159,10 +222,15 @@ Particular systems
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -174,6 +242,16 @@ and if that doesn't work, try
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +267,8 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -277,7 +356,7 @@ operates.
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.
 
diff --git a/util/macros/configure b/util/macros/configure
index 4ad3a2e9e..a3a2925fa 100644
--- a/util/macros/configure
+++ b/util/macros/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for util-macros 1.17.1.
+# Generated by GNU Autoconf 2.69 for util-macros 1.19.0.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='util-macros'
 PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.17.1'
-PACKAGE_STRING='util-macros 1.17.1'
+PACKAGE_VERSION='1.19.0'
+PACKAGE_STRING='util-macros 1.19.0'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -1197,7 +1197,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures util-macros 1.17.1 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.19.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1263,7 +1263,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of util-macros 1.17.1:";;
+     short | recursive ) echo "Configuration of util-macros 1.19.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1330,7 +1330,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-util-macros configure 1.17.1
+util-macros configure 1.19.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1347,7 +1347,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by util-macros $as_me 1.17.1, which was
+It was created by util-macros $as_me 1.19.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2172,7 +2172,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='util-macros'
- VERSION='1.17.1'
+ VERSION='1.19.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2828,7 +2828,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by util-macros $as_me 1.17.1, which was
+This file was extended by util-macros $as_me 1.19.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2881,7 +2881,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-util-macros config.status 1.17.1
+util-macros config.status 1.19.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/util/macros/configure.ac b/util/macros/configure.ac
index 6dcd53188..e38e00418 100644
--- a/util/macros/configure.ac
+++ b/util/macros/configure.ac
@@ -21,9 +21,9 @@ dnl  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl Process this file with autoconf to create configure.
 
-AC_PREREQ([2.60])
+AC_PREREQ([2.62])
 AC_INIT([util-macros],
-        [1.17.1],
+        [1.19.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [util-macros])
 AC_CONFIG_SRCDIR([Makefile.am])
diff --git a/util/macros/xorg-macros.m4.in b/util/macros/xorg-macros.m4.in
index 34304bf85..79d059827 100644
--- a/util/macros/xorg-macros.m4.in
+++ b/util/macros/xorg-macros.m4.in
@@ -87,6 +87,7 @@ if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
 	AC_MSG_RESULT([no])
 else
 	if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
+		TRADITIONALCPPFLAGS="-traditional"
 		RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
 		AC_MSG_RESULT([yes])
 	else
@@ -95,6 +96,7 @@ else
 fi
 rm -f conftest.$ac_ext
 AC_SUBST(RAWCPPFLAGS)
+AC_SUBST(TRADITIONALCPPFLAGS)
 ]) # XORG_PROG_RAWCPP
 
 # XORG_MANPAGE_SECTIONS()
@@ -619,9 +621,10 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
 ]) # XORG_WITH_ASCIIDOC
 
 # XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
-# --------------------------------
+# -------------------------------------------
 # Minimum version: 1.5.0
 # Minimum version for optional DEFAULT argument: 1.11.0
+# Minimum version for optional DOT checking: 1.18.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
@@ -641,6 +644,7 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
 #
 AC_DEFUN([XORG_WITH_DOXYGEN],[
 AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
+AC_ARG_VAR([DOT], [Path to the dot graphics utility])
 m4_define([_defopt], m4_default([$2], [auto]))
 AC_ARG_WITH(doxygen,
 	AS_HELP_STRING([--with-doxygen],
@@ -684,6 +688,20 @@ m4_ifval([$1],
             AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed])
         fi])
 fi])
+
+dnl Check for DOT if we have doxygen. The caller decides if it is mandatory
+dnl HAVE_DOT is a variable that can be used in your doxygen.in config file:
+dnl 	HAVE_DOT = @HAVE_DOT@
+HAVE_DOT=no
+if test "x$have_doxygen" = "xyes"; then
+  AC_PATH_PROG([DOT], [dot])
+    if test "x$DOT" != "x"; then
+      HAVE_DOT=yes
+    fi
+fi
+
+AC_SUBST([HAVE_DOT])
+AM_CONDITIONAL([HAVE_DOT], [test "$HAVE_DOT" = "yes"])
 AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
 ]) # XORG_WITH_DOXYGEN
 
@@ -866,6 +884,29 @@ fi])
 AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
 ]) # XORG_WITH_FOP
 
+# XORG_WITH_M4([MIN-VERSION])
+# ---------------------------
+# Minimum version: 1.19.0
+#
+# This macro attempts to locate an m4 macro processor which supports
+# -I option and is only useful for modules relying on M4 in order to
+# expand macros in source code files.
+#
+# Interface to module:
+# M4:	 	returns the path of the m4 program found
+#		returns the path set by the user in the environment
+#
+AC_DEFUN([XORG_WITH_M4], [
+AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4],
+   [AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4],
+       [[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \
+         ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]],
+   [AC_MSG_ERROR([could not find m4 that supports -I option])],
+   [$PATH:/usr/gnu/bin])])
+
+AC_SUBST([M4], [$ac_cv_path_M4])
+]) # XORG_WITH_M4
+
 # XORG_WITH_PS2PDF([DEFAULT])
 # ----------------
 # Minimum version: 1.6.0
@@ -1320,7 +1361,8 @@ AC_ARG_ENABLE(malloc0returnsnull,
 
 AC_MSG_CHECKING([whether malloc(0) returns NULL])
 if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
-	AC_RUN_IFELSE([AC_LANG_PROGRAM([
+AC_CACHE_VAL([xorg_cv_malloc0_returns_null],
+	[AC_RUN_IFELSE([AC_LANG_PROGRAM([
 #include <stdlib.h>
 ],[
     char *m0, *r0, *c0, *p;
@@ -1330,9 +1372,9 @@ if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
     c0 = calloc(0,10);
     exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1);
 ])],
-		[MALLOC_ZERO_RETURNS_NULL=yes],
-		[MALLOC_ZERO_RETURNS_NULL=no],
-		[MALLOC_ZERO_RETURNS_NULL=yes])
+		[xorg_cv_malloc0_returns_null=yes],
+		[xorg_cv_malloc0_returns_null=no])])
+MALLOC_ZERO_RETURNS_NULL=$xorg_cv_malloc0_returns_null
 fi
 AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
 
@@ -1621,7 +1663,7 @@ AC_LANG_CASE(
 		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes])
 		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs])
 		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast])
-		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition])
+		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition], [-fd])
 		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement])
 	]
 )
@@ -1630,16 +1672,17 @@ AC_LANG_CASE(
 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wunused])
 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized])
 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow])
-XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn])
 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
 
 # These are currently disabled because they are noisy.  They will be enabled
 # in the future once the codebase is sufficiently modernized to silence
 # them.  For now, I don't want them to drown out the other warnings.
-# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
 # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses])
 # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
 
 # Turn some warnings into errors, so we don't accidently get successful builds
 # when there are problems that should be fixed.