util/macros 1.2.1. Tested on a ports bulk build by naddy@.

8 files changed, 317 insertions, 59 deletions

diff --git a/util/macros/ChangeLog b/util/macros/ChangeLog
index c7eb91184..702386b59 100644
--- a/util/macros/ChangeLog
+++ b/util/macros/ChangeLog
@@ -1,3 +1,147 @@
+commit 58803c60b73110a49aecec4202e7820887633bcc
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Dec 16 15:05:46 2008 -0800
+
+    Version bump: 1.2.1
+
+commit e1d9461d1325bb7e48ef616650eb1d49f8945c2b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Dec 16 15:05:05 2008 -0800
+
+    Replace gitweb URL with cgit URL in README
+
+commit 55e8d740881ef622376440819119641e67aeb285
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:   Mon Dec 8 17:40:31 2008 +0100
+
+    fix distcheck target
+    
+    Arrange that distcleancheck ignores ChangeLog left over by distclean.
+    
+    Don't mention ChangeLog under *CLEANFILES, can't be rebuilt from release
+    tarball; ChangeLog is automatically distributed, no need to mention it.
+
+commit 88920d0896be5194f626888d5d8b54edd1ffe1f6
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Wed Dec 10 08:45:56 2008 +0100
+
+    use more CWARNFLAGS with gcc 3.4 too.
+    
+    Only gcc 3.3 and earlier version don't support them.
+    Reported and tested by Peter Breitenlohner.
+
+commit 9ff834493ece0a0ea7d7f15c1706bab022362cc5
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun Dec 7 11:54:39 2008 +0100
+
+    Fix CWARNFLAGS for gcc versions < 4
+
+commit 1d2a0c58ffa7be9c47ea0a097f54e012cf5d44de
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jul 30 13:47:04 2008 -0700
+
+    Allow setting XORG_SGML_PATH to a non-default path when running configure
+
+commit dcbbcb582cf712e59c1474632380943bea8f1a5e
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:   Fri Nov 14 23:06:48 2008 +0100
+
+    bump to 1.2.0
+
+commit 0e8c41dd09080cf692b7437bb23435137febaf26
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:   Fri Nov 14 23:05:45 2008 +0100
+
+    fix XORG_PROG_RAWCPP for cygwin
+    
+    Patch by Yaakov Selkowitz from xorg mailing list
+    http://lists.freedesktop.org/archives/xorg/attachments/20081016/04a64242/attachment.asc
+
+commit 4cce4c8169a252bce129411dbf70c3212974e7ca
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:   Fri Nov 14 22:59:28 2008 +0100
+
+    define XORG_CWARNFLAGS macro
+
+commit 2663b7a6b31e5e3d03b42a50b27f64737a35e9aa
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:   Fri Nov 14 22:38:27 2008 +0100
+
+    define and use XORG_CHANGELOG macro
+
+commit b8a5186c585b4f01971457f0d59cc7480cf528e8
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:   Fri Nov 14 22:26:06 2008 +0100
+
+    reorganize autoconf macro files
+    
+    append xorgversion.m4 to xorg-macros.m4.in, instead of installing
+    it as separate file.
+    Avoid copying some code from xorgversion.m4 to configure.ac.
+
+commit a3a533044de7c8c360d0de312ac75b32db04e35e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Mar 5 14:53:00 2008 -0500
+
+    bump to 1.1.6
+
+commit e1c1ee013e72dafd7b00ca96a8d4a25273b88e15
+Author: Jeremy Huddleston <jeremy@tifa-2.local>
+Date:   Sat Feb 16 02:18:50 2008 -0800
+
+    Support version strings  like 1.2.3-blah4
+
+commit e20c503d24e5ccf03035aa0f6d833d235d2179df
+Author: Keith Packard <keithp@koto.keithp.com>
+Date:   Mon Aug 13 19:21:58 2007 -0700
+
+    Cannot use AC_CHECK_FILE when cross compiling; assume no LINUXDOC.
+    
+    As AC_CHECK_FILE cannot be used when cross compiling, just assume linuxdoc
+    is not present.
+
+commit f2ddb356d86225a8ff6d1d1397fb2156cebd360f
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sun Dec 24 06:17:44 2006 +0200
+
+    bump to 1.1.5
+
+commit e8b485d9252ffbb357a0b987ab1488d4033b555c
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Mon Dec 18 18:25:25 2006 -0800
+
+    Bug 9368: non portable sed usage in xorgversion.m4
+    
+    Bugzilla #9368 <https://bugs.freedesktop.org/show_bug.cgi?id=9368>
+    Patch #8140 <https://bugs.freedesktop.org/attachment.cgi?id=8140>
+
+commit 0a4aadbda211a5128bae1c2e860b781c95c4bbf5
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sat Dec 16 01:14:27 2006 +0200
+
+    bump to 1.1.4
+
+commit eb371188086824c4655840dd72831d16fbfb17ce
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Dec 6 19:02:46 2006 +0200
+
+    Makefile.am: make ChangeLog hook safer
+    Make ChangeLog hook as safe as possible.
+
+commit e091014e3c7573a49ce51d67f359bd0f3d3e1893
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Nov 30 22:05:27 2006 +0200
+
+    bump to 1.1.3
+
+commit f15961997e9f5986857ed0b143cbaafda1a84cb8
+Author: Andres Salomon <dilinger@debian.org>
+Date:   Thu Nov 30 22:05:13 2006 +0200
+
+    xorgversion: automatic PACKAGE_VERSION_* (bug #8590)
+    Automatically define PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} when
+    XORG_RELEASE_VERSION is called.
+
 commit 0d92c7e31df95c09a9cf1215e9ccb069da97f27a
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Wed Nov 8 16:38:16 2006 +0200
diff --git a/util/macros/Makefile.am b/util/macros/Makefile.am
index 792d62fd5..265bfd79c 100644
--- a/util/macros/Makefile.am
+++ b/util/macros/Makefile.am
@@ -20,15 +20,17 @@
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 aclocaldir = $(datadir)/aclocal
-aclocal_DATA = xorgversion.m4 xorg-macros.m4
+aclocal_DATA = xorg-macros.m4
 
-EXTRA_DIST = $(aclocal_DATA) ChangeLog
+# Previous versions used to install xorgversion.m4, now integrated
+# into xorg-macros.m4.  Explicitly remove that old file in order not
+# to have a macro defined in two different files.
+install-data-hook:
+	rm -f $(DESTDIR)$(aclocaldir)/xorgversion.m4
 
 .PHONY: ChangeLog
 
 ChangeLog:
-	(cd $(srcdir) && git-log) > ChangeLog
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
-
-DISTCLEANFILES = ChangeLog
diff --git a/util/macros/Makefile.in b/util/macros/Makefile.in
index 5189b0a40..e4184be61 100644
--- a/util/macros/Makefile.in
+++ b/util/macros/Makefile.in
@@ -58,9 +58,11 @@ POST_UNINSTALL = :
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/xorg-macros.m4.in \
-	$(top_srcdir)/configure COPYING ChangeLog install-sh missing
+	$(srcdir)/xorgversion.m4 $(top_srcdir)/configure COPYING \
+	ChangeLog install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/xorgversion.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -88,13 +90,13 @@ am__remove_distdir = \
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 ECHO_C = @ECHO_C@
@@ -126,6 +128,7 @@ am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
 datadir = @datadir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 includedir = @includedir@
@@ -144,9 +147,7 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 aclocaldir = $(datadir)/aclocal
-aclocal_DATA = xorgversion.m4 xorg-macros.m4
-EXTRA_DIST = $(aclocal_DATA) ChangeLog
-DISTCLEANFILES = ChangeLog
+aclocal_DATA = xorg-macros.m4
 all: all-am
 
 .SUFFIXES:
@@ -183,7 +184,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-xorg-macros.m4: $(top_builddir)/config.status $(srcdir)/xorg-macros.m4.in
+xorg-macros.m4: $(top_builddir)/config.status $(srcdir)/xorg-macros.m4.in $(srcdir)/xorgversion.m4
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 uninstall-info-am:
 install-aclocalDATA: $(aclocal_DATA)
@@ -367,7 +368,6 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -392,6 +392,8 @@ info: info-am
 info-am:
 
 install-data-am: install-aclocalDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
 install-exec-am:
 
@@ -426,18 +428,24 @@ uninstall-am: uninstall-aclocalDATA uninstall-info-am
 	dist-zip distcheck distclean distclean-generic distcleancheck \
 	distdir distuninstallcheck dvi dvi-am html html-am info \
 	info-am install install-aclocalDATA install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-data-am install-data-hook install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-aclocalDATA uninstall-am \
 	uninstall-info-am
 
 
+# Previous versions used to install xorgversion.m4, now integrated
+# into xorg-macros.m4.  Explicitly remove that old file in order not
+# to have a macro defined in two different files.
+install-data-hook:
+	rm -f $(DESTDIR)$(aclocaldir)/xorgversion.m4
+
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/util/macros/README b/util/macros/README
index af2a462f8..3d7e08bbc 100644
--- a/util/macros/README
+++ b/util/macros/README
@@ -15,7 +15,7 @@ The master development code repository can be found at:
 
 	git://anongit.freedesktop.org/git/xorg/util/macros
 	
-	http://gitweb.freedesktop.org/?p=xorg-util-macros;a=summary	
+	http://cgit.freedesktop.org/xorg/util/macros/
 
 For more information on the git code manager, see:
 
diff --git a/util/macros/configure b/util/macros/configure
index 9b0d59e39..e4c1e2a5c 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.59 for util-macros 1.1.6.
+# Generated by GNU Autoconf 2.59 for util-macros 1.2.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -269,11 +269,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='util-macros'
 PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.1.6'
-PACKAGE_STRING='util-macros 1.1.6'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='util-macros 1.2.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CHANGELOG_CMD distcleancheck_listfiles LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -722,7 +722,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.1.6 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -784,7 +784,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of util-macros 1.1.6:";;
+     short | recursive ) echo "Configuration of util-macros 1.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -792,8 +792,7 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-release-version=STRING
-			Use release version string in package name
-
+                          Use release version string in package name
 
 Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 _ACEOF
@@ -891,7 +890,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-util-macros configure 1.1.6
+util-macros configure 1.2.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -905,7 +904,7 @@ cat >&5 <<_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.1.6, which was
+It was created by util-macros $as_me 1.2.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1503,7 +1502,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='util-macros'
- VERSION='1.1.6'
+ VERSION='1.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1634,9 +1633,31 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-# Since this is the package that installs the xorgversion.m4 file, we
-# cannot use it here.  Therefore, we copy the code from the m4 file.
-# Please try to keep them in sync.
+# This is the package that installs xorgversion.m4 as part of xorg-macros.m4.
+# In order to use xorgversion.m4 here, we include it explicitly.
+
+# XORG_RELEASE_VERSION
+# --------------------
+# Adds --with/without-release-string and changes the PACKAGE and
+# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION".  If
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.  Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
+
+
+
+# XORG_CHANGELOG()
+# ----------------
+# Minimum version: 1.2.0
+#
+# Defines the variable CHANGELOG_CMD as the command to generate
+# ChangeLog from git.
+#
+# Arrange that distcleancheck ignores ChangeLog left over by distclean.
+#
+ # XORG_CHANGELOG
+
+
+
 
 # Check whether --with-release-version or --without-release-version was given.
 if test "${with_release_version+set}" = set; then
@@ -1645,14 +1666,46 @@ if test "${with_release_version+set}" = set; then
 else
   RELEASE_VERSION=""
 fi;
-if test "x$RELEASE_VERSION" != "x"; then
-	PACKAGE="$PACKAGE-$RELEASE_VERSION"
-	PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
-	{ echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5
+	if test "x$RELEASE_VERSION" != "x"; then
+		PACKAGE="$PACKAGE-$RELEASE_VERSION"
+		PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
+		{ echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5
 echo "$as_me: Building with package name set to $PACKAGE" >&6;}
-fi
+	fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
+
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
+	if test "x$PVM" = "x"; then
+		PVM="0"
+	fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
+	if test "x$PVP" = "x"; then
+		PVP="0"
+	fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
+
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
+mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
+echo 'git directory not found: installing possibly empty changelog.' >&2)"
+
+distcleancheck_listfiles='find . -type f ! -name ChangeLog -print'
+
+
 
-                    ac_config_files="$ac_config_files Makefile xorg-macros.m4"
+                    ac_config_files="$ac_config_files Makefile xorg-macros.m4:xorg-macros.m4.in:xorgversion.m4"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -2046,7 +2099,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by util-macros $as_me 1.1.6, which was
+This file was extended by util-macros $as_me 1.2.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2101,7 +2154,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-util-macros config.status 1.1.6
+util-macros config.status 1.2.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -2205,7 +2258,7 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "xorg-macros.m4" ) CONFIG_FILES="$CONFIG_FILES xorg-macros.m4" ;;
+  "xorg-macros.m4" ) CONFIG_FILES="$CONFIG_FILES xorg-macros.m4:xorg-macros.m4.in:xorgversion.m4" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
@@ -2311,6 +2364,8 @@ s,@am__leading_dot@,$am__leading_dot,;t t
 s,@AMTAR@,$AMTAR,;t t
 s,@am__tar@,$am__tar,;t t
 s,@am__untar@,$am__untar,;t t
+s,@CHANGELOG_CMD@,$CHANGELOG_CMD,;t t
+s,@distcleancheck_listfiles@,$distcleancheck_listfiles,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
diff --git a/util/macros/configure.ac b/util/macros/configure.ac
index bfbe51824..36153dc90 100644
--- a/util/macros/configure.ac
+++ b/util/macros/configure.ac
@@ -23,22 +23,15 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 AC_INIT([util-macros],
-        [1.1.2],
+        [1.2.1],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
-# Since this is the package that installs the xorgversion.m4 file, we
-# cannot use it here.  Therefore, we copy the code from the m4 file.
-# Please try to keep them in sync.
-AC_ARG_WITH(release-version,
-		AC_HELP_STRING([--with-release-version=STRING]
-			[Use release version string in package name]),
-		[RELEASE_VERSION="$withval"],
-		[RELEASE_VERSION=""])
-if test "x$RELEASE_VERSION" != "x"; then
-	PACKAGE="$PACKAGE-$RELEASE_VERSION"
-	PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
-	AC_MSG_NOTICE([Building with package name set to $PACKAGE])
-fi
+# This is the package that installs xorgversion.m4 as part of xorg-macros.m4.
+# In order to use xorgversion.m4 here, we include it explicitly.
+m4_include([xorgversion.m4])
 
-AC_OUTPUT([Makefile xorg-macros.m4])
+XORG_RELEASE_VERSION
+XORG_CHANGELOG
+
+AC_OUTPUT([Makefile xorg-macros.m4:xorg-macros.m4.in:xorgversion.m4])
diff --git a/util/macros/xorg-macros.m4.in b/util/macros/xorg-macros.m4.in
index 11b1419af..cbdcfa6c5 100644
--- a/util/macros/xorg-macros.m4.in
+++ b/util/macros/xorg-macros.m4.in
@@ -1,3 +1,4 @@
+dnl @configure_input@
 dnl
 dnl Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
 dnl 
@@ -79,6 +80,10 @@ else
 	if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
 		RAWCPPFLAGS=-undef
 		AC_MSG_RESULT([yes])
+	# under Cygwin unix is still defined even with -undef
+	elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
+		RAWCPPFLAGS="-undef -ansi"
+		AC_MSG_RESULT([yes, with -ansi])
 	else
 		AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef.  I don't know what to do.])
 	fi
@@ -191,10 +196,16 @@ AC_SUBST([ADMIN_MAN_DIR])
 # Whether or not the necessary tools and files are found can be checked
 # with the AM_CONDITIONAL "BUILD_LINUXDOC"
 AC_DEFUN([XORG_CHECK_LINUXDOC],[
-XORG_SGML_PATH=$prefix/share/sgml
+if test x$XORG_SGML_PATH = x ; then
+    XORG_SGML_PATH=$prefix/share/sgml
+fi
 HAVE_DEFS_ENT=
 
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+  HAVE_DEFS_ENT=no
+else
+  AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
 
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -243,7 +254,9 @@ AC_SUBST(MAKE_HTML)
 # indicates whether the necessary tools and files are found and, if set,
 # $(MAKE_XXX) blah.sgml will produce blah.xxx.
 AC_DEFUN([XORG_CHECK_DOCBOOK],[
-XORG_SGML_PATH=$prefix/share/sgml
+if test x$XORG_SGML_PATH = x ; then
+    XORG_SGML_PATH=$prefix/share/sgml
+fi
 HAVE_DEFS_ENT=
 BUILDTXTDOC=no
 BUILDPDFDOC=no
@@ -419,3 +432,29 @@ AC_SUBST(LINTLIB)
 AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
 
 ]) # XORG_LINT_LIBRARY
+
+# XORG_CWARNFLAGS
+# ---------------
+# Minimum version: 1.2.0
+#
+# Defines CWARNFLAGS to enable C compiler warnings.
+#
+AC_DEFUN([XORG_CWARNFLAGS], [
+AC_REQUIRE([AC_PROG_CC])
+if  test "x$GCC" = xyes ; then
+    CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
+-Wbad-function-cast"
+    case `gcc -dumpversion` in
+    3.4.* | 4.*)
+	CWARNFLAGS+=" -Wold-style-definition -Wdeclaration-after-statement"
+	;;
+    esac
+else
+    AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+    if test "x$SUNCC" = "xyes"; then
+	CWARNFLAGS="-v"
+    fi
+fi
+AC_SUBST(CWARNFLAGS)
+]) # XORG_CWARNFLAGS
diff --git a/util/macros/xorgversion.m4 b/util/macros/xorgversion.m4
index 7d3dda874..881955dec 100644
--- a/util/macros/xorgversion.m4
+++ b/util/macros/xorgversion.m4
@@ -59,3 +59,20 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 		[$PVP],
 		[Patch version of this package])
 ])
+
+# XORG_CHANGELOG()
+# ----------------
+# Minimum version: 1.2.0
+#
+# Defines the variable CHANGELOG_CMD as the command to generate
+# ChangeLog from git.
+#
+# Arrange that distcleancheck ignores ChangeLog left over by distclean.
+#
+AC_DEFUN([XORG_CHANGELOG], [
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
+mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
+echo 'git directory not found: installing possibly empty changelog.' >&2)"
+AC_SUBST([CHANGELOG_CMD])
+AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
+]) # XORG_CHANGELOG