debian/changelog | 6 debian/xutils-dev.install | 1 util-macros/ChangeLog | 87 ++++++++ util-macros/Makefile.am | 12 - util-macros/Makefile.in | 48 ++-- util-macros/README | 2 util-macros/aclocal.m4 | 36 +-- util-macros/configure | 103 +++++++--- util-macros/configure.ac | 23 -- util-macros/install-sh | 228 ++++++++++------------ util-macros/xorg-macros.m4 | 425 ------------------------------------------ util-macros/xorg-macros.m4.in | 39 +++ util-macros/xorgversion.m4 | 17 + 13 files changed, 391 insertions(+), 636 deletions(-)
New commits: commit b37f4f1fa6cd7877e4ae8f89541924c841abe5f1 Author: Julien Cristau <jcris...@debian.org> Date: Fri Dec 19 13:34:52 2008 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index a99c55d..a63800e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xutils-dev (1:7.4+4) UNRELEASED; urgency=low +xutils-dev (1:7.4+4) unstable; urgency=low * util-macros 1.2.1. - -- Julien Cristau <jcris...@debian.org> Fri, 19 Dec 2008 13:14:59 +0100 + -- Julien Cristau <jcris...@debian.org> Fri, 19 Dec 2008 13:34:41 +0100 xutils-dev (1:7.4+3) unstable; urgency=low commit a44457e27f92e58749aa2ad42c28df6cd1b0b369 Author: Julien Cristau <jcris...@debian.org> Date: Fri Dec 19 13:33:49 2008 +0100 xorgversion.m4 is now included in xorg-macros.m4 diff --git a/debian/xutils-dev.install b/debian/xutils-dev.install index 1a18dbb..929e2e5 100644 --- a/debian/xutils-dev.install +++ b/debian/xutils-dev.install @@ -10,7 +10,6 @@ usr/share/man/man1/cleanlinks.1 usr/share/man/man1/mkhtmlindex.1 usr/share/man/man1/lndir.1 usr/share/man/man1/makedepend.1 -usr/share/aclocal/xorgversion.m4 usr/share/aclocal/xorg-macros.m4 usr/bin/gccmakedep usr/bin/imake commit a169e0031753f82ec68684c48de463bc157af89a Author: Julien Cristau <jcris...@debian.org> Date: Fri Dec 19 13:15:18 2008 +0100 util-macros 1.2.1 diff --git a/debian/changelog b/debian/changelog index ab95e1e..a99c55d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xutils-dev (1:7.4+4) UNRELEASED; urgency=low + + * util-macros 1.2.1. + + -- Julien Cristau <jcris...@debian.org> Fri, 19 Dec 2008 13:14:59 +0100 + xutils-dev (1:7.4+3) unstable; urgency=low * Add a mention of xorg-macros in the long description, so apt-cache search diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog index a3bee74..702386b 100644 --- a/util-macros/ChangeLog +++ b/util-macros/ChangeLog @@ -1,3 +1,90 @@ +commit 58803c60b73110a49aecec4202e7820887633bcc +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Tue Dec 16 15:05:46 2008 -0800 + + Version bump: 1.2.1 + +commit e1d9461d1325bb7e48ef616650eb1d49f8945c2b +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Tue Dec 16 15:05:05 2008 -0800 + + Replace gitweb URL with cgit URL in README + +commit 55e8d740881ef622376440819119641e67aeb285 +Author: Peter Breitenlohner <p...@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.he...@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.he...@laas.fr> +Date: Sun Dec 7 11:54:39 2008 +0100 + + Fix CWARNFLAGS for gcc versions < 4 + +commit 1d2a0c58ffa7be9c47ea0a097f54e012cf5d44de +Author: Alan Coopersmith <alan.coopersm...@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 <p...@mppmu.mpg.de> +Date: Fri Nov 14 23:06:48 2008 +0100 + + bump to 1.2.0 + +commit 0e8c41dd09080cf692b7437bb23435137febaf26 +Author: Peter Breitenlohner <p...@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 <p...@mppmu.mpg.de> +Date: Fri Nov 14 22:59:28 2008 +0100 + + define XORG_CWARNFLAGS macro + +commit 2663b7a6b31e5e3d03b42a50b27f64737a35e9aa +Author: Peter Breitenlohner <p...@mppmu.mpg.de> +Date: Fri Nov 14 22:38:27 2008 +0100 + + define and use XORG_CHANGELOG macro + +commit b8a5186c585b4f01971457f0d59cc7480cf528e8 +Author: Peter Breitenlohner <p...@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 <a...@redhat.com> +Date: Wed Mar 5 14:53:00 2008 -0500 + + bump to 1.1.6 + commit e1c1ee013e72dafd7b00ca96a8d4a25273b88e15 Author: Jeremy Huddleston <jer...@tifa-2.local> Date: Sat Feb 16 02:18:50 2008 -0800 diff --git a/util-macros/Makefile.am b/util-macros/Makefile.am index fd5c1ea..265bfd7 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: - (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 - -DISTCLEANFILES = ChangeLog diff --git a/util-macros/Makefile.in b/util-macros/Makefile.in index d8fafea..3fe2658 100644 --- a/util-macros/Makefile.in +++ b/util-macros/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,9 +54,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 \ @@ -84,13 +86,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@ @@ -129,6 +131,7 @@ build_alias = @build_alias@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ @@ -156,9 +159,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ 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: @@ -195,7 +196,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 $@ install-aclocalDATA: $(aclocal_DATA) @$(NORMAL_INSTALL) @@ -264,10 +265,6 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -295,8 +292,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -382,7 +377,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" @@ -407,6 +401,8 @@ info: info-am info-am: install-data-am: install-aclocalDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am @@ -444,14 +440,14 @@ ps-am: uninstall-am: uninstall-aclocalDATA -.MAKE: install-am install-strip +.MAKE: install-am install-data-am install-strip .PHONY: all all-am am--refresh check check-am clean clean-generic dist \ - dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ - dist-tarZ 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-dvi install-dvi-am \ + dist-all dist-bzip2 dist-gzip dist-hook dist-shar dist-tarZ \ + 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-data-hook install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ @@ -460,10 +456,16 @@ uninstall-am: uninstall-aclocalDATA pdf-am ps ps-am uninstall uninstall-aclocalDATA uninstall-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 af2a462..3d7e08b 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/aclocal.m4 b/util-macros/aclocal.m4 index 73ffc5f..2981344 100644 --- a/util-macros/aclocal.m4 +++ b/util-macros/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,12 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +31,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.10], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,10 +47,8 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -111,13 +106,13 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 12 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -222,17 +217,16 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC], # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. -_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $_am_arg | $_am_arg:* ) + $1 | $1:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -452,7 +446,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff --git a/util-macros/configure b/util-macros/configure index 409583d..e65549a 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.1.6. +# Generated by GNU Autoconf 2.61 for util-macros 1.2.1. # # 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.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 @@ -637,6 +637,8 @@ am__leading_dot AMTAR am__tar am__untar +CHANGELOG_CMD +distcleancheck_listfiles LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -1145,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.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]... @@ -1211,7 +1213,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 @@ -1219,8 +1221,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 @@ -1283,7 +1284,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -util-macros configure 1.1.6 +util-macros configure 1.2.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1297,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.1.6, which was +It was created by util-macros $as_me 1.2.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1987,7 +1988,7 @@ fi # Define the identity of the package. PACKAGE='util-macros' - VERSION='1.1.6' + VERSION='1.2.1' cat >>confdefs.h <<_ACEOF @@ -2134,9 +2135,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 was given. if test "${with_release_version+set}" = set; then @@ -2145,14 +2168,46 @@ 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 @@ -2580,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.1.6, which was +This file was extended by util-macros $as_me 1.2.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2623,7 +2678,7 @@ Report bugs to <bug-autoc...@gnu.org>." _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.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -2724,7 +2779,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "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;} @@ -2844,11 +2899,13 @@ am__leading_dot!$am__leading_dot$ac_delim AMTAR!$AMTAR$ac_delim am__tar!$am__tar$ac_delim am__untar!$am__untar$ac_delim +CHANGELOG_CMD!$CHANGELOG_CMD$ac_delim +distcleancheck_listfiles!$distcleancheck_listfiles$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 61; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/util-macros/configure.ac b/util-macros/configure.ac index 676a70d..36153dc 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.6], + [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/install-sh b/util-macros/install-sh index a5897de..4fbbae7 100755 --- a/util-macros/install-sh +++ b/util-macros/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2006-10-14.15 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ IFS=" "" $nl" # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} +doit="${DOITPROG-}" if test -z "$doit"; then doit_exec=exec else @@ -58,49 +58,34 @@ fi # Put in absolute file names if you don't have them in your path; # or use environment vars. -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" +posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 -chgrpcmd= chmodcmd=$chmodprog chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" +chgrpcmd= stripcmd= - +rmcmd="$rmprog -f" +mvcmd="$mvprog" src= dst= dir_arg= -dst_arg= - -copy_on_change=false +dstarg= no_target_directory= -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -110,55 +95,65 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. In the 4th, create DIRECTORIES. Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) ;; - - -C) copy_on_change=true;; + -c) shift + continue;; - -d) dir_arg=true;; + -d) dir_arg=true + shift + continue;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift + shift + continue;; --help) echo "$usage"; exit $?;; -m) mode=$2 + shift + shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - shift;; + continue;; -o) chowncmd="$chownprog $2" - shift;; + shift + shift + continue;; - -s) stripcmd=$stripprog;; + -s) stripcmd=$stripprog + shift + continue;; - -t) dst_arg=$2 - shift;; + -t) dstarg=$2 + shift + shift + continue;; - -T) no_target_directory=true;; + -T) no_target_directory=true + shift + continue;; --version) echo "$0 $scriptversion"; exit $?;; @@ -170,22 +165,21 @@ while test $# -ne 0; do *) break;; esac - shift done -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then +if test $# -ne 0 && test -z "$dir_arg$dstarg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $...@. for arg do - if test -n "$dst_arg"; then + if test -n "$dstarg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" + set fnord "$@" "$dstarg" shift # fnord fi shift # arg - dst_arg=$arg + dstarg=$arg done fi @@ -230,7 +224,7 @@ for src do # Protect names starting with `-'. case $src in - -*) src=./$src;; + -*) src=./$src ;; esac if test -n "$dir_arg"; then @@ -248,22 +242,22 @@ do exit 1 fi - if test -z "$dst_arg"; then + if test -z "$dstarg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg + dst=$dstarg # Protect names starting with `-'. case $dst in - -*) dst=./$dst;; + -*) dst=./$dst ;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 + echo "$0: $dstarg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -384,19 +378,26 @@ do # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; + /*) prefix=/ ;; + -*) prefix=./ ;; + *) prefix= ;; esac - eval "$initialize_posix_glob" + case $posix_glob in + '') + if (set -f) 2>/dev/null; then + posix_glob=true + else + posix_glob=false + fi ;; + esac oIFS=$IFS IFS=/ - $posix_glob set -f + $posix_glob && set -f set fnord $dstdir shift - $posix_glob set +f + $posix_glob && set +f IFS=$oIFS prefixes= @@ -458,54 +459,41 @@ do # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org