70-gary-omit-useless-tags.patch

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Okay to commit?

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>

        * m4/libtool.m4 (_LT_COPYING): Factor out copyright message so it
        only needs to be updated in one place.
        (AC_LIBTOOL_CONFIG): Refactor to be more readable.  Only add
        tags if a compiler was found; ie if you have no gcj compiler,
        don't tack the GCJ tag onto the generated libtool script.
Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.29
diff -u -p -u -r1.29 libtool.m4
- --- m4/libtool.m4 7 Jan 2004 12:26:25 -0000 1.29
+++ m4/libtool.m4 12 Jan 2004 01:30:28 -0000
@@ -1,26 +1,31 @@
~ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- -## Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
- -## Free Software Foundation, Inc.
- -## Originally by Gordon Matzigkeit <address@hidden>, 1996
- -##
- -## This program is free software; you can redistribute it and/or modify
- -## it under the terms of the GNU General Public License as published by
- -## the Free Software Foundation; either version 2 of the License, or
- -## (at your option) any later version.
- -##
- -## This program is distributed in the hope that it will be useful, but
- -## WITHOUT ANY WARRANTY; without even the implied warranty of
- -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- -## General Public License for more details.
- -##
- -## You should have received a copy of the GNU General Public License
- -## along with this program; if not, write to the Free Software
- -## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- -##
- -## As a special exception to the GNU General Public License, if you
- -## distribute this file as part of a program that contains a
- -## configuration script generated by Autoconf, you may include it under
- -## the same distribution terms that you use for the rest of that program.
+
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <address@hidden>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+])

~ # serial 49 AC_PROG_LIBTOOL

@@ -34,7 +39,6 @@ m4_ifdef([AC_PROVIDE_IFELSE],
~                [m4_ifdef([AC_PROVIDE_$1],
~                          [$2], [$3])])])

- -
~ # AC_PROG_LIBTOOL
~ # ---------------
~ AC_DEFUN([AC_PROG_LIBTOOL],
@@ -472,79 +476,45 @@ _LT_OUTPUT_LIBTOOL_INIT
~ # TAGNAME from the matching tagged config vars.
~ m4_define([AC_LIBTOOL_CONFIG],
~ [_LT_CONFIG_SAVE_COMMANDS([
- -  # See if we are running on zsh, and set the options which allow our
- -  # commands through without removal of \ escapes.
- -  if test -n "${ZSH_VERSION+set}" ; then
- -    setopt NO_GLOB_SUBST
- -  fi
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+    $rm -f "$cfgfile"

- -  m4_if([$1], [],
- -      [cfgfile="${ofile}T"
- -      trap "$rm \"$cfgfile\"; exit 1" 1 2 15
- -      $rm -f "$cfgfile"],
- -    [cfgfile="$ofile"]
- -  )
- -
- -  cat <<_LT_EOF >> "$cfgfile"
- -m4_if([$1], [],
- -[#! $SHELL
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL

- -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized
library-building support services.
- -# Generated automatically by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building
support services.
+# Generated automatically by config.status (GNU $PACKAGE$TIMESTAMP) $VERSION
~ # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 
1q`:
~ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
~ #
- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
- -# Free Software Foundation, Inc.
- -#
- -# This file is part of GNU Libtool:
- -# Originally by Gordon Matzigkeit <address@hidden>, 1996
- -#
- -# This program is free software; you can redistribute it and/or modify
- -# it under the terms of the GNU General Public License as published by
- -# the Free Software Foundation; either version 2 of the License, or
- -# (at your option) any later version.
- -#
- -# This program is distributed in the hope that it will be useful, but
- -# WITHOUT ANY WARRANTY; without even the implied warranty of
- -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- -# General Public License for more details.
- -#
- -# You should have received a copy of the GNU General Public License
- -# along with this program; if not, write to the Free Software
- -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- -#
- -# As a special exception to the GNU General Public License, if you
- -# distribute this file as part of a program that contains a
- -# configuration script generated by Autoconf, you may include it under
- -# the same distribution terms that you use for the rest of that program.
- -
- -# The HP-UX ksh and POSIX shell print the target directory to stdout
- -# if CDPATH is set.
- -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+_LT_COPYING

~ # The names of the tagged configurations supported by this script.
~ available_tags=

~ # ### BEGIN LIBTOOL CONFIG
- -_LT_LIBTOOL_CONFIG_VARS],
- -[# ### BEGIN LIBTOOL TAG CONFIG: $1
- -])[]dnl
- -_LT_LIBTOOL_TAG_VARS([$1])
- -
- -# A language-specific compiler.
- -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
- -
- -m4_if([$1],[],
- -      [# ### END LIBTOOL CONFIG],
- -    [# ### END LIBTOOL TAG CONFIG: $1])
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
~ _LT_EOF

- -m4_if([$1],[], [
~   case $host_os in
~   aix3*)
~     cat <<\_LT_EOF >> "$cfgfile"
- -
~ # AIX sometimes has problems with the GCC collect2 program.  For some
~ # reason, if we set the COLLECT_NAMES environment variable, the problems
~ # vanish in a puff of smoke.
@@ -557,6 +527,7 @@ _LT_EOF
~   esac

~   _LT_PROG_LTMAIN
+
~   # We use sed instead of cat because bash on DJGPP gets confused if
~   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
~   # text mode, it properly converts lines to CR/LF.  This bash problem
@@ -566,15 +537,26 @@ _LT_EOF
~   mv -f "$cfgfile" "$ofile" || \
~     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
~   chmod +x "$ofile"
- -])
+],
+[if test -n "[$]_LT_TAG" && test "X[$]_LT_TAG" != "Xno"; then
+  cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+fi
+])dnl /m4_if
~ ],
~ [m4_if([$1], [], [
- -  rm='$rm'
- -  PACKAGE='$PACKAGE'
- -  VERSION='$VERSION'
- -  TIMESTAMP='$TIMESTAMP'
- -  ofile='$ofile'])
- -])
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    rm='$rm'
+    ofile='$ofile'], [$1='[$]$1'])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
~ ])# AC_LIBTOOL_CONFIG


- --
~  ())_. Gary V. Vaughan     gary@(oranda.demon.co.uk|gnu.org)
~  ( '/  Research Scientist  http://www.oranda.demon.co.uk       ,_())____
~  / )=  GNU Hacker          http://www.gnu.org/software/libtool  \'      `&
`(_~)_  Tech' Author        http://sources.redhat.com/autobook   =`---d__/
_________________________________________________________
This patch notification generated by cvsapply version 0.8
http://savannah.gnu.org/projects/cvs-utils
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFAApDkFRMICSmD1gYRAi8YAKCgK9GDQyNouXXSBTXQddZZ32Q4qACfb0vB
vO4JR9vYdd2vmedN9/Oh5pI=
=/aBO
-----END PGP SIGNATURE-----