From af2f4f7ea351df92d99f94cbc70899d57d81070f Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sat, 17 Feb 2007 17:52:04 +0100 Subject: * Update util-macros to 1.1.5 (X11R7.2). --- util-macros/ChangeLog | 36 ++++++++++++++++++++++++++++++++++++ util-macros/Makefile.am | 2 +- util-macros/Makefile.in | 2 +- util-macros/aclocal.m4 | 4 ++-- util-macros/configure | 24 ++++++++++++------------ util-macros/configure.ac | 2 +- util-macros/xorg-macros.m4 | 2 +- util-macros/xorgversion.m4 | 20 +++++++++++++++++++- 8 files changed, 73 insertions(+), 19 deletions(-) (limited to 'util-macros') diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog index c7eb911..d633f8b 100644 --- a/util-macros/ChangeLog +++ b/util-macros/ChangeLog @@ -1,3 +1,39 @@ +commit e8b485d9252ffbb357a0b987ab1488d4033b555c +Author: Matthieu Herrb +Date: Mon Dec 18 18:25:25 2006 -0800 + + Bug 9368: non portable sed usage in xorgversion.m4 + + Bugzilla #9368 + Patch #8140 + +commit 0a4aadbda211a5128bae1c2e860b781c95c4bbf5 +Author: Daniel Stone +Date: Sat Dec 16 01:14:27 2006 +0200 + + bump to 1.1.4 + +commit eb371188086824c4655840dd72831d16fbfb17ce +Author: Daniel Stone +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 +Date: Thu Nov 30 22:05:27 2006 +0200 + + bump to 1.1.3 + +commit f15961997e9f5986857ed0b143cbaafda1a84cb8 +Author: Andres Salomon +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 Date: Wed Nov 8 16:38:16 2006 +0200 diff --git a/util-macros/Makefile.am b/util-macros/Makefile.am index 792d62f..fd5c1ea 100644 --- a/util-macros/Makefile.am +++ b/util-macros/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = $(aclocal_DATA) ChangeLog .PHONY: ChangeLog ChangeLog: - (cd $(srcdir) && git-log) > 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) dist-hook: ChangeLog diff --git a/util-macros/Makefile.in b/util-macros/Makefile.in index 2e8b063..bd86c42 100644 --- a/util-macros/Makefile.in +++ b/util-macros/Makefile.in @@ -479,7 +479,7 @@ uninstall-am: uninstall-aclocalDATA uninstall-info-am .PHONY: ChangeLog ChangeLog: - (cd $(srcdir) && git-log) > 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) dist-hook: ChangeLog # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/util-macros/aclocal.m4 b/util-macros/aclocal.m4 index 2c5b18d..0c263fb 100644 --- a/util-macros/aclocal.m4 +++ b/util-macros/aclocal.m4 @@ -385,10 +385,10 @@ AMSHOWCMDSAT='' AMDEPSHOWCMDSAT='' AMPRETTYECHO=true AMCMDECHO=echo -if test "x$enable_pretty_cmds" == xyes; +if test "x$enable_pretty_cmds" = xyes; then AMSHOWCMDSAT='@' - _AM_IF_OPTION([no-dependencies],,test x$enable_dependency_tracking == xno &&) AMDEPSHOWCMDSAT='@' + _AM_IF_OPTION([no-dependencies],,test "x$enable_dependency_tracking" = xno &&) AMDEPSHOWCMDSAT='@' AMPRETTYECHO=echo AMCMDECHO=true LT_QUIET='--quiet' diff --git a/util-macros/configure b/util-macros/configure index 49b51b4..9b0e210 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.60 for util-macros 1.1.2. +# Generated by GNU Autoconf 2.60 for util-macros 1.1.5. # # Report bugs to . # @@ -559,8 +559,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='util-macros' PACKAGE_TARNAME='util-macros' -PACKAGE_VERSION='1.1.2' -PACKAGE_STRING='util-macros 1.1.2' +PACKAGE_VERSION='1.1.5' +PACKAGE_STRING='util-macros 1.1.5' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_subst_vars='SHELL @@ -1134,7 +1134,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.2 to adapt to many kinds of systems. +\`configure' configures util-macros 1.1.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1200,7 +1200,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of util-macros 1.1.2:";; + short | recursive ) echo "Configuration of util-macros 1.1.5:";; esac cat <<\_ACEOF @@ -1278,7 +1278,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -util-macros configure 1.1.2 +util-macros configure 1.1.5 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1292,7 +1292,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.1.2, which was +It was created by util-macros $as_me 1.1.5, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -1951,10 +1951,10 @@ AMSHOWCMDSAT='' AMDEPSHOWCMDSAT='' AMPRETTYECHO=true AMCMDECHO=echo -if test "x$enable_pretty_cmds" == xyes; +if test "x$enable_pretty_cmds" = xyes; then AMSHOWCMDSAT='@' - test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@' + test "x$enable_dependency_tracking" = xno && AMDEPSHOWCMDSAT='@' AMPRETTYECHO=echo AMCMDECHO=true LT_QUIET='--quiet' @@ -1985,7 +1985,7 @@ fi # Define the identity of the package. PACKAGE='util-macros' - VERSION='1.1.2' + VERSION='1.1.5' cat >>confdefs.h <<_ACEOF @@ -2566,7 +2566,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.1.2, which was +This file was extended by util-macros $as_me 1.1.5, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2609,7 +2609,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -util-macros config.status 1.1.2 +util-macros config.status 1.1.5 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/util-macros/configure.ac b/util-macros/configure.ac index bfbe518..ad8b250 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.1.2], + [1.1.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff --git a/util-macros/xorg-macros.m4 b/util-macros/xorg-macros.m4 index 6152f51..6b707eb 100644 --- a/util-macros/xorg-macros.m4 +++ b/util-macros/xorg-macros.m4 @@ -45,7 +45,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[ 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=1.1.2 + [XORG_MACROS_version=1.1.5 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 diff --git a/util-macros/xorgversion.m4 b/util-macros/xorgversion.m4 index 01bffec..f270127 100644 --- a/util-macros/xorgversion.m4 +++ b/util-macros/xorgversion.m4 @@ -27,7 +27,8 @@ dnl # -------------------- # 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. +# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also +# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. AC_DEFUN([XORG_RELEASE_VERSION],[ AC_ARG_WITH(release-version, @@ -40,4 +41,21 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" AC_MSG_NOTICE([Building with package name set to $PACKAGE]) fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], + [`echo $PACKAGE_VERSION | cut -d . -f 1`], + [Major version of this package]) + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + if test "x$PVM" = "x"; then + PVM="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], + [$PVM], + [Minor version of this package]) + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + if test "x$PVP" = "x"; then + PVP="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], + [$PVP], + [Patch version of this package]) ]) -- cgit v1.2.3