util-macros 1.2.2.

5 files changed, 114 insertions, 30 deletions

diff --git a/debian/changelog b/debian/changelog
index ef2f31d..e14ec64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xutils-dev (1:7.4+5) UNRELEASED; urgency=low
 
   * Don't call dh_makeshlibs, silences lintian warning.
   * Fix patches 01 and 02 to apply with -p1, to silence lintian.
+  * util-macros 1.2.2.
 
  -- Julien Cristau <jcristau@debian.org>  Fri, 19 Dec 2008 13:41:50 +0100
 
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index 702386b..a21ec23 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,89 @@
+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
diff --git a/util-macros/configure b/util-macros/configure
index e65549a..310451e 100755
--- 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.61 for util-macros 1.2.1.
+# Generated by GNU Autoconf 2.61 for util-macros 1.2.2.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='util-macros'
 PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='util-macros 1.2.1'
+PACKAGE_VERSION='1.2.2'
+PACKAGE_STRING='util-macros 1.2.2'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_subst_vars='SHELL
@@ -1147,7 +1147,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.2.1 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.2.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1213,7 +1213,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of util-macros 1.2.1:";;
+     short | recursive ) echo "Configuration of util-macros 1.2.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1284,7 +1284,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-util-macros configure 1.2.1
+util-macros configure 1.2.2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1298,7 +1298,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.2.1, which was
+It was created by util-macros $as_me 1.2.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1988,7 +1988,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='util-macros'
- VERSION='1.2.1'
+ VERSION='1.2.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2635,7 +2635,7 @@ exec 6>&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.2.1, which was
+This file was extended by util-macros $as_me 1.2.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2678,7 +2678,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-util-macros config.status 1.2.1
+util-macros config.status 1.2.2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/util-macros/configure.ac b/util-macros/configure.ac
index 36153dc..e142e93 100644
--- a/util-macros/configure.ac
+++ b/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.2.2],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
diff --git a/util-macros/xorg-macros.m4.in b/util-macros/xorg-macros.m4.in
index cbdcfa6..bcf8c44 100644
--- a/util-macros/xorg-macros.m4.in
+++ b/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:
-# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+# To ensure that this macro is defined, also add:
+# 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],[
-	[XORG_MACROS_needed_version=$1
-	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
-	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
-	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-	[XORG_MACROS_version=@VERSION@
-	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
-	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
-	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
-		AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
-	fi
-	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])
+m4_defun([XORG_MACROS_VERSION],[
+m4_define([vers_have], [@VERSION@])
+m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
+m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
+m4_if(m4_cmp(maj_have, maj_needed), 0,,
+    [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
+m4_if(m4_version_compare(vers_have, [$1]), -1,
+    [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
+m4_undefine([vers_have])
+m4_undefine([maj_have])
+m4_undefine([maj_needed])
 ]) # XORG_MACROS_VERSION
 
 # XORG_PROG_RAWCPP()
@@ -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