update to util-macros 1.3.0.

util/macros/ChangeLog

@@ -1,3 +1,157 @@
+commit d6584a4a52a6fb0eaf979555097bb32621c13cb1
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Sep 9 13:31:38 2009 -0700
+
+    Version bump: 1.3.0
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 79c00a5b5c7866fcc4756993cf4bf4eb2234e9de
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Tue Sep 1 09:45:30 2009 -0400
+
+    Fix obsolete macro warnings for AC_HELP_STRING #23628
+    
+    When checking for warnings in any module using XORG_RELEASE_VERSION
+    one or more warnings on AC_HELP_STRING appears. The macro has been
+    replaced with AS_HELP_STRING
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Acked-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 4c91617d964915005634339afa24b04ec8a2f801
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Sep 1 10:33:37 2009 +1000
+
+    Add XORG_DEFAULT_OPTIONS meta-macro.
+    
+    Many modules use the same set of m4 macros. Additions to the macros require
+    updating the configure.ac for each module affected. In the case of e.g.
+    protos and libs this means updating every single module.
+    
+    This patch adds a XORG_DEFAULT_OPTIONS meta-macro that uses the other macros
+    defined. Macros can be added to this meta-macro and modules immediately get
+    to make use of it - without changes required to configure.ac.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3b7dd69d0bf6bc19f0e4403bb6611de87497aac3
+Author: Pauli Nieminen <suokkos@gmail.com>
+Date:   Sat Jul 25 15:53:02 2009 +0300
+
+    Add XORG_STRICT_OPTION macro for strict compilation option
+    
+    Strict compilation option can be used to get rid of warnings that often are
+    showing real hidden bug in code. That just waits to cause problems.
+    
+    CWARNFLAGS has to be added to AM_C(PP)FLAGS to use strict compilation mode
+    in Makefile.am. Automatic addition to compiler flags would cause some configure
+    checks fail.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b0618a909a56d958a6690318545379e105587d82
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Aug 25 09:40:01 2009 +1000
+
+    Add AM_SILENT_RULES to default XORG_CWARNFLAGS
+    
+    Automake 1.11 supports silent builds with the new AM_SILENT_RULES.
+    http://sources.redhat.com/automake/automake.html#Options
+    
+    This loosely qualifies as a CWARNFLAG since it allows all the warnings to be
+    seen and enables modules to gain support from the feature without any
+    changes needed to configure.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit 347e2ae727ac43026776154172ca1ad0360c903c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Jun 18 11:26:09 2009 -0700
+
+    Version bump: 1.2.2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit b885bb59ec23bb338c8df68e40c6ef2c2a9325cc
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date:   Mon Jun 8 14:17:06 2009 +0100
+
+    Use correct CWARNFLAGS when cross compiling
+    
+    Rather than checking the version of some random gcc which happens to be in
+    the path to determine which warning flags are supported, we should check the
+    gcc we are going to use for the build
+    
+    For example, when cross-compiling, if the host gcc is >= 3.4 but the
+    cross-compiler gcc is not, this will cause unsupported warning flags to be
+    used
+    
+    This seems to work, but I don't know enough autofoolery to be sure this is
+    right...
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 21a957428aa69b03f585378dc6e70ad9f5c513c6
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date:   Fri Feb 6 12:28:03 2009 -0800
+
+    Use m4 for XORG_MACROS_VERSION to error during autoconf
+    
+    Check the needed macros version with m4 so that the proper version is
+    determined during autoconf. This prevents a faulty configure from being
+    generated.
+    
+    Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 72d82ed965f9cfbc310897ec17d2dc10bddcef4e
+Author: Dan <danstowell+xorg@gmail.com>
+Date:   Thu Feb 19 06:50:30 2009 -0800
+
+    Fix incorrect warning message in XORG_MACROS_VERSION
+    
+    Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit b3a43fbe312d4da796aa1fcb04a8a27f7961641d
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date:   Thu Feb 5 13:30:27 2009 -0800
+
+    Restore part of the XORG_MACROS_VERSION comment
+    
+    The 1.1 or later part is actually important since XORG_MACROS_VERSION
+    didn't exist before then.
+    
+    Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit f05148fa57a1ebdb75135f026b7c5f4678a3b293
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date:   Thu Feb 5 09:17:17 2009 -0800
+
+    Fix comment in XORG_MACROS_VERSION on usage
+    
+    The comment recommending checking XORG_MACROS_VERSION with m4_ifndef was
+    flawed for two reasons:
+    
+     * m4_fatal should be used if the macro is not defined. There's no use
+       generating configure if the macro doesn't exist. Just fail during
+       autoconf.
+     * There's no reason to mention the version needed in the message. That
+       check does not do version verification. That's what the actual macro
+       is for.
+    
+    Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 96585612d17d31fa9dd0f5c260fc33f72be9a75f
+Author: Jeremy Huddleston <jeremy@redxiii.local>
+Date:   Sun Feb 1 21:09:44 2009 -0800
+
+    XORG_CWARNFLAGS: += is not valid for appending in bourn scripts
+    
+    Fixes:
+    
+    ./configure: line 12921: CWARNFLAGS+= -Wold-style-definition -Wdeclaration-after-statement: command not found
+
 commit 58803c60b73110a49aecec4202e7820887633bcc
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Dec 16 15:05:46 2008 -0800

util/macros/Makefile.in

@@ -121,27 +121,33 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
 datadir = @datadir@
+datarootdir = @datarootdir@
 distcleancheck_listfiles = @distcleancheck_listfiles@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@

util/macros/configure.ac

@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 AC_INIT([util-macros],
-        [1.2.1],
+        [1.3.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

util/macros/xorg-macros.m4.in

@@ -35,27 +35,24 @@ dnl of the copyright holder.
 # your configure.ac with the minimum required version, such as:
 # XORG_MACROS_VERSION(1.1)
 #
-# To force at least a version with this macro defined, also add:
+# To ensure that this macro is defined, also add:
-# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+# m4_ifndef([XORG_MACROS_VERSION],
+#     [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
 #
 #
 # See the "minimum version" comment for each macro you use to see what 
 # version you require.
-AC_DEFUN([XORG_MACROS_VERSION],[
+m4_defun([XORG_MACROS_VERSION],[
-	[XORG_MACROS_needed_version=$1
+m4_define([vers_have], [@VERSION@])
-	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
+m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
-	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
+m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
-	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
+m4_if(m4_cmp(maj_have, maj_needed), 0,,
-	[XORG_MACROS_version=@VERSION@
+    [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
-	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
+m4_if(m4_version_compare(vers_have, [$1]), -1,
-	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
+    [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
-	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
+m4_undefine([vers_have])
-		AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
+m4_undefine([maj_have])
-	fi
+m4_undefine([maj_needed])
-	if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
-		AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
-	fi
-	AC_MSG_RESULT([yes, $XORG_MACROS_version])
 ]) # XORG_MACROS_VERSION
 
 # XORG_PROG_RAWCPP()
@@ -322,7 +319,7 @@ AC_SUBST(MAKE_HTML)
 # their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
 AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
 AC_ARG_ENABLE(malloc0returnsnull,
-	AC_HELP_STRING([--enable-malloc0returnsnull],
+	AS_HELP_STRING([--enable-malloc0returnsnull],
 		       [malloc(0) returns NULL (default: auto)]),
 	[MALLOC_ZERO_RETURNS_NULL=$enableval],
 	[MALLOC_ZERO_RETURNS_NULL=auto])
@@ -374,7 +371,7 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
 AC_DEFUN([XORG_WITH_LINT],[
 
 # Allow checking code with lint, sparse, etc.
-AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
+AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
 		[Use a lint-style source code checker (default: disabled)])],
 		[use_lint=$withval], [use_lint=no])
 if test "x$use_lint" = "xyes" ; then
@@ -415,7 +412,7 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
 AC_DEFUN([XORG_LINT_LIBRARY],[
 AC_REQUIRE([XORG_WITH_LINT])
 # Build lint "library" for more indepth checks of programs calling this library
-AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
+AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
 	[Create lint library (default: disabled)])],
 	[make_lint_lib=$enableval], [make_lint_lib=no])
 if test "x$make_lint_lib" != "xno" ; then
@@ -445,9 +442,9 @@ 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
+    case `$CC -dumpversion` in
     3.4.* | 4.*)
-	CWARNFLAGS+=" -Wold-style-definition -Wdeclaration-after-statement"
+	CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
 	;;
     esac
 else
@@ -457,4 +454,48 @@ else
     fi
 fi
 AC_SUBST(CWARNFLAGS)
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 ]) # XORG_CWARNFLAGS
+
+# XORG_STRICT_OPTION
+# -----------------------
+# Minimum version: 1.3.0
+#
+# Add configure option to enable strict compilation
+AC_DEFUN([XORG_STRICT_OPTION], [
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_CWARNFLAGS])
+
+AC_ARG_ENABLE(strict-compilation,
+			  AS_HELP_STRING([--enable-strict-compilation],
+			  [Enable all warnings from compiler and make them errors (default: disabled)]),
+			  [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
+if test "x$STRICT_COMPILE" = "xyes"; then
+	AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+	AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
+	if test "x$GCC" = xyes ; then
+		STRICT_CFLAGS="-pedantic -Werror"
+	elif test "x$SUNCC" = "xyes"; then
+		STRICT_CFLAGS="-errwarn"
+    elif test "x$INTELCC" = "xyes"; then
+		STRICT_CFLAGS="-Werror"
+	fi
+fi
+CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+AC_SUBST([CWARNFLAGS])
+]) # XORG_STRICT_OPTION
+
+# XORG_DEFAULT_OPTIONS
+# --------------------
+# Minimum version: 1.3.0
+#
+# Defines default options for X.Org modules.
+#
+AC_DEFUN([XORG_DEFAULT_OPTIONS], [
+XORG_CWARNFLAGS
+XORG_STRICT_OPTION
+XORG_RELEASE_VERSION
+XORG_CHANGELOG
+XORG_MANPAGE_SECTIONS
+]) # XORG_DEFAULT_OPTIONS

util/macros/xorgversion.m4

@@ -32,7 +32,7 @@ dnl
  
 AC_DEFUN([XORG_RELEASE_VERSION],[
 	AC_ARG_WITH(release-version,
-			AC_HELP_STRING([--with-release-version=STRING],
+			AS_HELP_STRING([--with-release-version=STRING],
 				[Use release version string in package name]),
 			[RELEASE_VERSION="$withval"],
 			[RELEASE_VERSION=""])