diff options
Diffstat (limited to 'ubuntu/maverick/applications/kasablanca/debian/patches/02_autotools_update.diff')
| -rw-r--r-- | ubuntu/maverick/applications/kasablanca/debian/patches/02_autotools_update.diff | 1985 |
1 files changed, 1985 insertions, 0 deletions
diff --git a/ubuntu/maverick/applications/kasablanca/debian/patches/02_autotools_update.diff b/ubuntu/maverick/applications/kasablanca/debian/patches/02_autotools_update.diff new file mode 100644 index 000000000..51818ca9c --- /dev/null +++ b/ubuntu/maverick/applications/kasablanca/debian/patches/02_autotools_update.diff @@ -0,0 +1,1985 @@ +diff -Nrua a/admin/compile b/admin/compile +--- a/admin/compile 2004-03-22 19:59:16.000000000 +0100 ++++ b/admin/compile 2006-03-21 19:11:17.000000000 +0100 +@@ -1,8 +1,9 @@ + #! /bin/sh +- + # Wrapper for compilers which do not understand `-c -o'. + +-# Copyright 1999, 2000 Free Software Foundation, Inc. ++scriptversion=2005-05-14.22 ++ ++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. + # Written by Tom Tromey <tromey@cygnus.com>. + # + # This program is free software; you can redistribute it and/or modify +@@ -17,83 +18,125 @@ + # + # 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. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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. + +-# Usage: +-# compile PROGRAM [ARGS]... +-# `-o FOO.o' is removed from the args passed to the actual compile. +- +-prog=$1 +-shift ++# This file is maintained in Automake, please report ++# bugs to <bug-automake@gnu.org> or send patches to ++# <automake-patches@gnu.org>. ++ ++case $1 in ++ '') ++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ++ exit 1; ++ ;; ++ -h | --h*) ++ cat <<\EOF ++Usage: compile [--help] [--version] PROGRAM [ARGS] ++ ++Wrapper for compilers which do not understand `-c -o'. ++Remove `-o dest.o' from ARGS, run PROGRAM with the remaining ++arguments, and rename the output as expected. ++ ++If you are trying to build a whole package this is not the ++right script to run: please start by reading the file `INSTALL'. ++ ++Report bugs to <bug-automake@gnu.org>. ++EOF ++ exit $? ++ ;; ++ -v | --v*) ++ echo "compile $scriptversion" ++ exit $? ++ ;; ++esac + + ofile= + cfile= +-args= +-while test $# -gt 0; do +- case "$1" in +- -o) +- # configure might choose to run compile as `compile cc -o foo foo.c'. +- # So we do something ugly here. +- ofile=$2 +- shift +- case "$ofile" in +- *.o | *.obj) +- ;; +- *) +- args="$args -o $ofile" +- ofile= +- ;; +- esac +- ;; +- *.c) +- cfile=$1 +- args="$args $1" +- ;; +- *) +- args="$args $1" +- ;; +- esac +- shift ++eat= ++ ++for arg ++do ++ if test -n "$eat"; then ++ eat= ++ else ++ case $1 in ++ -o) ++ # configure might choose to run compile as `compile cc -o foo foo.c'. ++ # So we strip `-o arg' only if arg is an object. ++ eat=1 ++ case $2 in ++ *.o | *.obj) ++ ofile=$2 ++ ;; ++ *) ++ set x "$@" -o "$2" ++ shift ++ ;; ++ esac ++ ;; ++ *.c) ++ cfile=$1 ++ set x "$@" "$1" ++ shift ++ ;; ++ *) ++ set x "$@" "$1" ++ shift ++ ;; ++ esac ++ fi ++ shift + done + + if test -z "$ofile" || test -z "$cfile"; then +- # If no `-o' option was seen then we might have been invoked from a +- # pattern rule where we don't need one. That is ok -- this is a +- # normal compilation that the losing compiler can handle. If no +- # `.c' file was seen then we are probably linking. That is also +- # ok. +- exec "$prog" $args ++ # If no `-o' option was seen then we might have been invoked from a ++ # pattern rule where we don't need one. That is ok -- this is a ++ # normal compilation that the losing compiler can handle. If no ++ # `.c' file was seen then we are probably linking. That is also ++ # ok. ++ exec "$@" + fi + + # Name of file we expect compiler to create. +-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` ++cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` + + # Create the lock directory. + # Note: use `[/.-]' here to ensure that we don't use the same name + # that we are using for the .o file. Also, base the name on the expected + # object file name, since that is what matters with a parallel build. +-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d ++lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d + while true; do +- if mkdir $lockdir > /dev/null 2>&1; then +- break +- fi +- sleep 1 ++ if mkdir "$lockdir" >/dev/null 2>&1; then ++ break ++ fi ++ sleep 1 + done + # FIXME: race condition here if user kills between mkdir and trap. +-trap "rmdir $lockdir; exit 1" 1 2 15 ++trap "rmdir '$lockdir'; exit 1" 1 2 15 + + # Run the compile. +-"$prog" $args +-status=$? ++"$@" ++ret=$? + + if test -f "$cofile"; then +- mv "$cofile" "$ofile" ++ mv "$cofile" "$ofile" ++elif test -f "${cofile}bj"; then ++ mv "${cofile}bj" "$ofile" + fi + +-rmdir $lockdir +-exit $status ++rmdir "$lockdir" ++exit $ret ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff -Nrua a/admin/depcomp b/admin/depcomp +--- a/admin/depcomp 2004-03-22 19:59:17.000000000 +0100 ++++ b/admin/depcomp 2006-03-21 19:11:17.000000000 +0100 +@@ -1,7 +1,9 @@ + #! /bin/sh +- + # depcomp - compile a program generating dependencies as side-effects +-# Copyright 1999, 2000 Free Software Foundation, Inc. ++ ++scriptversion=2005-07-09.11 ++ ++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. + + # 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 +@@ -15,8 +17,8 @@ + + # 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. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -25,13 +27,45 @@ + + # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. + ++case $1 in ++ '') ++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ++ exit 1; ++ ;; ++ -h | --h*) ++ cat <<\EOF ++Usage: depcomp [--help] [--version] PROGRAM [ARGS] ++ ++Run PROGRAMS ARGS to compile a file, generating dependencies ++as side-effects. ++ ++Environment variables: ++ depmode Dependency tracking mode. ++ source Source file read by `PROGRAMS ARGS'. ++ object Object file output by `PROGRAMS ARGS'. ++ DEPDIR directory where to store dependencies. ++ depfile Dependency file to output. ++ tmpdepfile Temporary file to use when outputing dependencies. ++ libtool Whether libtool is used (yes/no). ++ ++Report bugs to <bug-automake@gnu.org>. ++EOF ++ exit $? ++ ;; ++ -v | --v*) ++ echo "depcomp $scriptversion" ++ exit $? ++ ;; ++esac ++ + if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 + fi +-# `libtool' can also be set to `yes' or `no'. + +-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} ++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. ++depfile=${depfile-`echo "$object" | ++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} + tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + + rm -f "$tmpdepfile" +@@ -163,19 +197,25 @@ + + aix) + # The C for AIX Compiler uses -M and outputs the dependencies +- # in a .u file. This file always lives in the current directory. +- # Also, the AIX compiler puts `$object:' at the start of each line; +- # $object doesn't have directory information. +- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` ++ # in a .u file. In older versions, this file always lives in the ++ # current directory. Also, the AIX compiler puts `$object:' at the ++ # start of each line; $object doesn't have directory information. ++ # Version 6 uses the directory in both cases. ++ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` + tmpdepfile="$stripped.u" +- outname="$stripped.o" + if test "$libtool" = yes; then + "$@" -Wc,-M + else + "$@" -M + fi +- + stat=$? ++ ++ if test -f "$tmpdepfile"; then : ++ else ++ stripped=`echo "$stripped" | sed 's,^.*/,,'` ++ tmpdepfile="$stripped.u" ++ fi ++ + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" +@@ -183,6 +223,7 @@ + fi + + if test -f "$tmpdepfile"; then ++ outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. +@@ -198,11 +239,9 @@ + ;; + + icc) +- # Must come before tru64. +- +- # Intel's C compiler understands `-MD -MF file'. However ++ # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c +- # will fill foo.d with something like ++ # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: +@@ -210,6 +249,12 @@ + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: ++ # ICC 7.1 will output ++ # foo.o: sub/foo.c sub/foo.h ++ # and will wrap long lines using \ : ++ # foo.o: sub/foo.c ... \ ++ # sub/foo.h ... \ ++ # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? +@@ -219,45 +264,70 @@ + exit $stat + fi + rm -f "$depfile" +- # Each line is of the form `foo.o: dependent.h'. ++ # Each line is of the form `foo.o: dependent.h', ++ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. +- sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" +- sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" ++ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" ++ # Some versions of the HPUX 10.20 sed can't process this invocation ++ # correctly. Breaking it into two sed invocations is a workaround. ++ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | ++ sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + + tru64) +- # The Tru64 AIX compiler uses -MD to generate dependencies as a side ++ # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. +- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put ++ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + +- tmpdepfile1="$object.d" +- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` + if test "$libtool" = yes; then ++ # With Tru64 cc, shared objects can also be used to make a ++ # static library. This mecanism is used in libtool 1.4 series to ++ # handle both shared and static libraries in a single compilation. ++ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. ++ # ++ # With libtool 1.5 this exception was removed, and libtool now ++ # generates 2 separate objects for the 2 libraries. These two ++ # compilations output dependencies in in $dir.libs/$base.o.d and ++ # in $dir$base.o.d. We have to check for both files, because ++ # one of the two compilations can be disabled. We should prefer ++ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is ++ # automatically cleaned when .libs/ is deleted, while ignoring ++ # the former would cause a distcleancheck panic. ++ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 ++ tmpdepfile2=$dir$base.o.d # libtool 1.5 ++ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 ++ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else ++ tmpdepfile1=$dir$base.o.d ++ tmpdepfile2=$dir$base.d ++ tmpdepfile3=$dir$base.d ++ tmpdepfile4=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile1" "$tmpdepfile2" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + exit $stat + fi + +- if test -f "$tmpdepfile1"; then +- tmpdepfile="$tmpdepfile1" +- else +- tmpdepfile="$tmpdepfile2" +- fi ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" ++ do ++ test -f "$tmpdepfile" && break ++ done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" +- # That's a space and a tab in the []. +- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" ++ # That's a tab and a space in the []. ++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi +@@ -270,34 +340,42 @@ + + dashmstdout) + # Important note: in order to support this mode, a compiler *must* +- # always write the proprocessed file to stdout, regardless of -o, +- # because we must use -o when running libtool. +- test -z "$dashmflag" && dashmflag=-M +- ( IFS=" " +- case " $* " in +- *" --mode=compile "*) # this is libtool, let us make it quiet +- for arg +- do # cycle over the arguments +- case "$arg" in +- "--mode=compile") +- # insert --quiet before "--mode=compile" +- set fnord "$@" --quiet +- shift # fnord +- ;; +- esac +- set fnord "$@" "$arg" +- shift # fnord +- shift # "$arg" +- done ++ # always write the preprocessed file to stdout, regardless of -o. ++ "$@" || exit $? ++ ++ # Remove the call to Libtool. ++ if test "$libtool" = yes; then ++ while test $1 != '--mode=compile'; do ++ shift ++ done ++ shift ++ fi ++ ++ # Remove `-o $object'. ++ IFS=" " ++ for arg ++ do ++ case $arg in ++ -o) ++ shift ++ ;; ++ $object) ++ shift ++ ;; ++ *) ++ set fnord "$@" "$arg" ++ shift # fnord ++ shift # $arg + ;; + esac +- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" +- ) & +- proc=$! +- "$@" +- stat=$? +- wait "$proc" +- if test "$stat" != 0; then exit $stat; fi ++ done ++ ++ test -z "$dashmflag" && dashmflag=-M ++ # Require at least two characters before searching for `:' ++ # in the target name. This is to cope with DOS-style filenames: ++ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. ++ "$@" $dashmflag | ++ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +@@ -315,36 +393,40 @@ + ;; + + makedepend) +- # X makedepend +- ( +- shift +- cleared=no +- for arg in "$@"; do +- case $cleared in no) +- set ""; shift +- cleared=yes +- esac +- case "$arg" in +- -D*|-I*) +- set fnord "$@" "$arg"; shift;; +- -*) +- ;; +- *) +- set fnord "$@" "$arg"; shift;; +- esac ++ "$@" || exit $? ++ # Remove any Libtool call ++ if test "$libtool" = yes; then ++ while test $1 != '--mode=compile'; do ++ shift + done +- obj_suffix="`echo $object | sed 's/^.*\././'`" +- touch "$tmpdepfile" +- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" +- ) & +- proc=$! +- "$@" +- stat=$? +- wait "$proc" +- if test "$stat" != 0; then exit $stat; fi ++ shift ++ fi ++ # X makedepend ++ shift ++ cleared=no ++ for arg in "$@"; do ++ case $cleared in ++ no) ++ set ""; shift ++ cleared=yes ;; ++ esac ++ case "$arg" in ++ -D*|-I*) ++ set fnord "$@" "$arg"; shift ;; ++ # Strip any option that makedepend may not understand. Remove ++ # the object too, otherwise makedepend will parse it as a source file. ++ -*|$object) ++ ;; ++ *) ++ set fnord "$@" "$arg"; shift ;; ++ esac ++ done ++ obj_suffix="`echo $object | sed 's/^.*\././'`" ++ touch "$tmpdepfile" ++ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" +- tail +3 "$tmpdepfile" | tr ' ' ' ++ sed '1,2d' "$tmpdepfile" | tr ' ' ' + ' | \ + ## Some versions of the HPUX 10.20 sed can't process this invocation + ## correctly. Breaking it into two sed invocations is a workaround. +@@ -354,35 +436,40 @@ + + cpp) + # Important note: in order to support this mode, a compiler *must* +- # always write the proprocessed file to stdout, regardless of -o, +- # because we must use -o when running libtool. +- ( IFS=" " +- case " $* " in +- *" --mode=compile "*) +- for arg +- do # cycle over the arguments +- case $arg in +- "--mode=compile") +- # insert --quiet before "--mode=compile" +- set fnord "$@" --quiet +- shift # fnord +- ;; +- esac +- set fnord "$@" "$arg" +- shift # fnord +- shift # "$arg" +- done ++ # always write the preprocessed file to stdout. ++ "$@" || exit $? ++ ++ # Remove the call to Libtool. ++ if test "$libtool" = yes; then ++ while test $1 != '--mode=compile'; do ++ shift ++ done ++ shift ++ fi ++ ++ # Remove `-o $object'. ++ IFS=" " ++ for arg ++ do ++ case $arg in ++ -o) ++ shift ++ ;; ++ $object) ++ shift ++ ;; ++ *) ++ set fnord "$@" "$arg" ++ shift # fnord ++ shift # $arg + ;; + esac +- "$@" -E | +- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | ++ done ++ ++ "$@" -E | ++ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ ++ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" +- ) & +- proc=$! +- "$@" +- stat=$? +- wait "$proc" +- if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" +@@ -392,34 +479,27 @@ + + msvisualcpp) + # Important note: in order to support this mode, a compiler *must* +- # always write the proprocessed file to stdout, regardless of -o, ++ # always write the preprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. +- ( IFS=" " +- case " $* " in +- *" --mode=compile "*) +- for arg +- do # cycle over the arguments +- case $arg in +- "--mode=compile") +- # insert --quiet before "--mode=compile" +- set fnord "$@" --quiet +- shift # fnord +- ;; +- esac ++ "$@" || exit $? ++ IFS=" " ++ for arg ++ do ++ case "$arg" in ++ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") ++ set fnord "$@" ++ shift ++ shift ++ ;; ++ *) + set fnord "$@" "$arg" +- shift # fnord +- shift # "$arg" +- done +- ;; ++ shift ++ shift ++ ;; + esac +- "$@" -E | +- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" +- ) & +- proc=$! +- "$@" +- stat=$? +- wait "$proc" +- if test "$stat" != 0; then exit $stat; fi ++ done ++ "$@" -E | ++ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" +@@ -439,3 +519,12 @@ + esac + + exit 0 ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff -Nrua a/admin/install-sh b/admin/install-sh +--- a/admin/install-sh 2004-05-19 04:10:18.000000000 +0200 ++++ b/admin/install-sh 2006-03-21 19:11:17.000000000 +0100 +@@ -1,19 +1,38 @@ + #!/bin/sh +-# + # install - install a program, script, or datafile +-# This comes from X11R5 (mit/util/scripts/install.sh). ++ ++scriptversion=2005-05-14.22 ++ ++# This originates from X11R5 (mit/util/scripts/install.sh), which was ++# later released in X11R6 (xc/config/util/install.sh) with the ++# following copyright and license. ++# ++# Copyright (C) 1994 X Consortium ++# ++# Permission is hereby granted, free of charge, to any person obtaining a copy ++# of this software and associated documentation files (the "Software"), to ++# deal in the Software without restriction, including without limitation the ++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++# sell copies of the Software, and to permit persons to whom the Software is ++# furnished to do so, subject to the following conditions: ++# ++# The above copyright notice and this permission notice shall be included in ++# all copies or substantial portions of the Software. + # +-# Copyright 1991 by the Massachusetts Institute of Technology ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + # +-# Permission to use, copy, modify, distribute, and sell this software and its +-# documentation for any purpose is hereby granted without fee, provided that +-# the above copyright notice appear in all copies and that both that +-# copyright notice and this permission notice appear in supporting +-# documentation, and that the name of M.I.T. not be used in advertising or +-# publicity pertaining to distribution of the software without specific, +-# written prior permission. M.I.T. makes no representations about the +-# suitability of this software for any purpose. It is provided "as is" +-# without express or implied warranty. ++# Except as contained in this notice, the name of the X Consortium shall not ++# be used in advertising or otherwise to promote the sale, use or other deal- ++# ings in this Software without prior written authorization from the X Consor- ++# tium. ++# ++# ++# FSF changes to this file are in the public domain. + # + # Calling this script install-sh is preferred over install.sh, to prevent + # `make' implicit rules from creating a file called install from it +@@ -23,13 +42,11 @@ + # from scratch. It can only install one file at a time, a restriction + # shared with many OS's install programs. + +- + # set DOITPROG to echo to test this script + + # Don't use :- since 4.3BSD and earlier shells don't like it. + doit="${DOITPROG-}" + +- + # put in absolute paths if you don't have them in your path; or use env. vars. + + mvprog="${MVPROG-mv}" +@@ -41,236 +58,266 @@ + rmprog="${RMPROG-rm}" + mkdirprog="${MKDIRPROG-mkdir}" + +-transformbasename="" +-transform_arg="" +-instcmd="$mvprog" + chmodcmd="$chmodprog 0755" +-chowncmd="" +-chgrpcmd="" +-stripcmd="" ++chowncmd= ++chgrpcmd= ++stripcmd= + rmcmd="$rmprog -f" + mvcmd="$mvprog" +-src="" +-dst="" +-dir_arg="" +- +-while [ x"$1" != x ]; do +- case $1 in +- -c) instcmd=$cpprog +- shift +- continue;; +- +- -d) dir_arg=true +- shift +- continue;; +- +- -m) chmodcmd="$chmodprog $2" +- shift +- shift +- continue;; +- +- -o) chowncmd="$chownprog $2" +- shift +- shift +- continue;; +- +- -g) chgrpcmd="$chgrpprog $2" +- shift +- shift +- continue;; +- +- -s) stripcmd=$stripprog +- shift +- continue;; +- +- -t=*) transformarg=`echo $1 | sed 's/-t=//'` +- shift +- continue;; +- +- -b=*) transformbasename=`echo $1 | sed 's/-b=//'` +- shift +- continue;; +- +- *) if [ x"$src" = x ] +- then +- src=$1 +- else +- # this colon is to work around a 386BSD /bin/sh bug +- : +- dst=$1 +- fi +- shift +- continue;; +- esac +-done ++src= ++dst= ++dir_arg= ++dstarg= ++no_target_directory= ++ ++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++ or: $0 [OPTION]... SRCFILES... DIRECTORY ++ or: $0 [OPTION]... -t DIRECTORY SRCFILES... ++ or: $0 [OPTION]... -d DIRECTORIES... ++ ++In the 1st form, copy SRCFILE to DSTFILE. ++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ++In the 4th, create DIRECTORIES. ++ ++Options: ++-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 CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG ++" ++ ++while test -n "$1"; do ++ case $1 in ++ -c) shift ++ continue;; ++ ++ -d) dir_arg=true ++ shift ++ continue;; ++ ++ -g) chgrpcmd="$chgrpprog $2" ++ shift ++ shift ++ continue;; ++ ++ --help) echo "$usage"; exit $?;; ++ ++ -m) chmodcmd="$chmodprog $2" ++ shift ++ shift ++ continue;; ++ ++ -o) chowncmd="$chownprog $2" ++ shift ++ shift ++ continue;; ++ ++ -s) stripcmd=$stripprog ++ shift ++ continue;; + +-if [ x"$src" = x ] +-then +- echo "$0: no input file specified" >&2 +- exit 1 +-else +- : +-fi +- +-if [ x"$dir_arg" != x ]; then +- dst=$src +- src="" +- +- if [ -d "$dst" ]; then +- instcmd=: +- chmodcmd="" +- else +- instcmd=$mkdirprog +- fi +-else +- +-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command +-# might cause directories to be created, which would be especially bad +-# if $src (and thus $dsttmp) contains '*'. +- +- if [ -f "$src" ] || [ -d "$src" ] +- then +- : +- else +- echo "$0: $src does not exist" >&2 +- exit 1 +- fi +- +- if [ x"$dst" = x ] +- then +- echo "$0: no destination specified" >&2 +- exit 1 +- else +- : +- fi +- +-# If destination is a directory, append the input filename; if your system +-# does not like double slashes in filenames, you may need to add some logic +- +- if [ -d "$dst" ] +- then +- dst=$dst/`basename "$src"` +- else +- : +- fi +-fi +- +-## this sed command emulates the dirname command +-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` +- +-# Make sure that the destination directory exists. +-# this part is taken from Noah Friedman's mkinstalldirs script +- +-# Skip lots of stat calls in the usual case. +-if [ ! -d "$dstdir" ]; then +-defaultIFS=' +- ' +-IFS="${IFS-$defaultIFS}" +- +-oIFS=$IFS +-# Some sh's can't handle IFS=/ for some reason. +-IFS='%' +-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` +-IFS=$oIFS +- +-pathcomp='' ++ -t) dstarg=$2 ++ shift ++ shift ++ continue;; + +-while [ $# -ne 0 ] ; do +- pathcomp=$pathcomp$1 ++ -T) no_target_directory=true + shift ++ continue;; + +- if [ ! -d "$pathcomp" ] ; +- then +- $mkdirprog "$pathcomp" +- else +- : +- fi ++ --version) echo "$0 $scriptversion"; exit $?;; + +- pathcomp=$pathcomp/ ++ *) # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ test -n "$dir_arg$dstarg" && break ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dstarg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dstarg" ++ shift # fnord ++ fi ++ shift # arg ++ dstarg=$arg ++ done ++ break;; ++ esac + done +-fi +- +-if [ x"$dir_arg" != x ] +-then +- $doit $instcmd "$dst" && + +- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi +-else +- +-# If we're going to rename the final executable, determine the name now. +- +- if [ x"$transformarg" = x ] +- then +- dstfile=`basename "$dst"` +- else +- dstfile=`basename "$dst" $transformbasename | +- sed $transformarg`$transformbasename +- fi +- +-# don't allow the sed command to completely eliminate the filename +- +- if [ x"$dstfile" = x ] +- then +- dstfile=`basename "$dst"` +- else +- : +- fi +- +-# Make a couple of temp file names in the proper directory. +- +- dsttmp=$dstdir/#inst.$$# +- rmtmp=$dstdir/#rm.$$# +- +-# Trap to clean up temp files at exit. +- +- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 +- trap '(exit $?); exit' 1 2 13 15 +- +-# Move or copy the file name to the temp name +- +- $doit $instcmd "$src" "$dsttmp" && +- +-# and set any options; do chmod last to preserve setuid bits +- +-# If any of these fail, we abort the whole thing. If we want to +-# ignore errors from any of these, just make sure not to ignore +-# errors from the above "$doit $instcmd $src $dsttmp" command. +- +- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && +- +-# Now remove or move aside any old file at destination location. We try this +-# two ways since rm can't unlink itself on some systems and the destination +-# file might be busy for other reasons. In this case, the final cleanup +-# might fail but the new file should still install successfully. +- +-{ +- if [ -f "$dstdir/$dstfile" ] +- then +- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || +- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || +- { +- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 +- (exit 1); exit +- } +- else +- : +- fi +-} && +- +-# Now rename the file to the real destination. ++if test -z "$1"; then ++ if test -z "$dir_arg"; then ++ echo "$0: no input file specified." >&2 ++ exit 1 ++ fi ++ # It's OK to call `install-sh -d' without argument. ++ # This can happen when creating conditional directories. ++ exit 0 ++fi + +- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ++for src ++do ++ # Protect names starting with `-'. ++ case $src in ++ -*) src=./$src ;; ++ esac ++ ++ if test -n "$dir_arg"; then ++ dst=$src ++ src= ++ ++ if test -d "$dst"; then ++ mkdircmd=: ++ chmodcmd= ++ else ++ mkdircmd=$mkdirprog ++ fi ++ else ++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ++ # might cause directories to be created, which would be especially bad ++ # if $src (and thus $dsttmp) contains '*'. ++ if test ! -f "$src" && test ! -d "$src"; then ++ echo "$0: $src does not exist." >&2 ++ exit 1 ++ fi ++ ++ if test -z "$dstarg"; then ++ echo "$0: no destination specified." >&2 ++ exit 1 ++ fi ++ ++ dst=$dstarg ++ # Protect names starting with `-'. ++ case $dst in ++ -*) dst=./$dst ;; ++ esac + +-fi && ++ # 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: $dstarg: Is a directory" >&2 ++ exit 1 ++ fi ++ dst=$dst/`basename "$src"` ++ fi ++ fi ++ ++ # This sed command emulates the dirname command. ++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` ++ ++ # Make sure that the destination directory exists. ++ ++ # Skip lots of stat calls in the usual case. ++ if test ! -d "$dstdir"; then ++ defaultIFS=' ++ ' ++ IFS="${IFS-$defaultIFS}" ++ ++ oIFS=$IFS ++ # Some sh's can't handle IFS=/ for some reason. ++ IFS='%' ++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ++ shift ++ IFS=$oIFS ++ ++ pathcomp= ++ ++ while test $# -ne 0 ; do ++ pathcomp=$pathcomp$1 ++ shift ++ if test ! -d "$pathcomp"; then ++ $mkdirprog "$pathcomp" ++ # mkdir can fail with a `File exist' error in case several ++ # install-sh are creating the directory concurrently. This ++ # is OK. ++ test -d "$pathcomp" || exit ++ fi ++ pathcomp=$pathcomp/ ++ done ++ fi ++ ++ if test -n "$dir_arg"; then ++ $doit $mkdircmd "$dst" \ ++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } ++ ++ else ++ dstfile=`basename "$dst"` ++ ++ # Make a couple of temp file names in the proper directory. ++ dsttmp=$dstdir/_inst.$$_ ++ rmtmp=$dstdir/_rm.$$_ ++ ++ # Trap to clean up those temp files at exit. ++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ++ trap '(exit $?); exit' 1 2 13 15 ++ ++ # Copy the file name to the temp name. ++ $doit $cpprog "$src" "$dsttmp" && ++ ++ # and set any options; do chmod last to preserve setuid bits. ++ # ++ # If any of these fail, we abort the whole thing. If we want to ++ # 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 "$dsttmp"; } && ++ ++ # Now rename the file to the real destination. ++ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ ++ || { ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ if test -f "$dstdir/$dstfile"; then ++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ ++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ ++ || { ++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ++ (exit 1); exit 1 ++ } ++ else ++ : ++ fi ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ++ } ++ } ++ fi || { (exit 1); exit 1; } ++done + + # The final little trick to "correctly" pass the exit status to the exit trap. +- + { +- (exit 0); exit ++ (exit 0); exit 0 + } ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff -Nrua a/admin/missing b/admin/missing +--- a/admin/missing 2004-03-22 19:59:32.000000000 +0100 ++++ b/admin/missing 2006-03-21 19:11:17.000000000 +0100 +@@ -1,6 +1,10 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. +-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. ++ ++scriptversion=2005-06-08.21 ++ ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. + # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. + + # This program is free software; you can redistribute it and/or modify +@@ -15,8 +19,8 @@ + + # 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. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -38,18 +42,24 @@ + configure_ac=configure.in + fi + ++msg="missing on your system" ++ + case "$1" in + --run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 ++ # Exit code 63 means version mismatch. This often happens ++ # when the user try to use an ancient version of a tool on ++ # a file that requires a minimum version. In this case we ++ # we should proceed has if the program had been absent, or ++ # if --run hadn't been passed. ++ if test $? = 63; then ++ run=: ++ msg="probably too old" ++ fi + ;; +-esac +- +-# If it does not exist, or fails to run (possibly an outdated version), +-# try to emulate it. +-case "$1" in + + -h|--h|--he|--hel|--help) + echo "\ +@@ -74,11 +84,15 @@ + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags +- yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ++ yacc create \`y.tab.[ch]', if possible, from existing .[ch] ++ ++Send bug reports to <bug-automake@gnu.org>." ++ exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) +- echo "missing 0.4 - GNU automake" ++ echo "missing $scriptversion (GNU Automake)" ++ exit $? + ;; + + -*) +@@ -87,14 +101,44 @@ + exit 1 + ;; + +- aclocal*) ++esac ++ ++# Now exit if we have it, but it failed. Also exit now if we ++# don't have it and --version was passed (most likely to detect ++# the program). ++case "$1" in ++ lex|yacc) ++ # Not GNU programs, they don't have --version. ++ ;; ++ ++ tar) ++ if test -n "$run"; then ++ echo 1>&2 "ERROR: \`tar' requires --run" ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ exit 1 ++ fi ++ ;; ++ ++ *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ # Could not run --version or --help. This is probably someone ++ # running `$TOOL --version' or `$TOOL --help' to check whether ++ # $TOOL exists and not knowing $TOOL uses missing. ++ exit 1 + fi ++ ;; ++esac + ++# If it does not exist, or fails to run (possibly an outdated version), ++# try to emulate it. ++case "$1" in ++ aclocal*) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." +@@ -102,13 +146,8 @@ + ;; + + autoconf) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." +@@ -116,13 +155,8 @@ + ;; + + autoheader) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." +@@ -140,13 +174,8 @@ + ;; + + automake*) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." +@@ -156,16 +185,11 @@ + ;; + + autom4te) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is needed, and you do not seem to have it handy on your +- system. You might have modified some files without having the ++WARNING: \`$1' is needed, but is $msg. ++ You might have modified some files without having the + proper tools for further handling them. +- You can get \`$1Help2man' as part of \`Autoconf' from any GNU ++ You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` +@@ -185,7 +209,7 @@ + + bison|yacc) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." +@@ -215,7 +239,7 @@ + + lex|flex) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." +@@ -237,13 +261,8 @@ + ;; + + help2man) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." +@@ -262,32 +281,30 @@ + ;; + + makeinfo) +- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then +- # We have makeinfo, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." ++ # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then +- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` +- fi ++ # ... or it is the one specified with @setfilename ... ++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ++ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` ++ # ... or it is derived from the source name (dir/f.texi becomes f.info) ++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info ++ fi ++ # If the file does not exist, the user really needs makeinfo; ++ # let's fail without touching anything. ++ test -f $file || exit 1 + touch $file + ;; + + tar) + shift +- if test -n "$run"; then +- echo 1>&2 "ERROR: \`tar' requires --run" +- exit 1 +- fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error +@@ -323,10 +340,10 @@ + + *) + echo 1>&2 "\ +-WARNING: \`$1' is needed, and you do not seem to have it handy on your +- system. You might have modified some files without having the ++WARNING: \`$1' is needed, and is $msg. ++ You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, +- it often tells you about the needed prerequirements for installing ++ it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 +@@ -334,3 +351,10 @@ + esac + + exit 0 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs +--- a/admin/mkinstalldirs 2004-03-22 19:59:32.000000000 +0100 ++++ b/admin/mkinstalldirs 2006-03-21 19:11:17.000000000 +0100 +@@ -1,21 +1,33 @@ + #! /bin/sh + # mkinstalldirs --- make directory hierarchy +-# Author: Noah Friedman <friedman@prep.ai.mit.edu> ++ ++scriptversion=2005-06-29.22 ++ ++# Original author: Noah Friedman <friedman@prep.ai.mit.edu> + # Created: 1993-05-16 +-# Public domain ++# Public domain. ++# ++# This file is maintained in Automake, please report ++# bugs to <bug-automake@gnu.org> or send patches to ++# <automake-patches@gnu.org>. + + errstatus=0 +-dirmode="" ++dirmode= + + usage="\ +-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." ++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... ++ ++Create each directory DIR (with mode MODE, if specified), including all ++leading file name components. ++ ++Report bugs to <bug-automake@gnu.org>." + + # process command line arguments + while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help +- echo "$usage" 1>&2 +- exit 0 ++ echo "$usage" ++ exit $? + ;; + -m) # -m PERM arg + shift +@@ -23,6 +35,10 @@ + dirmode=$1 + shift + ;; ++ --version) ++ echo "$0 $scriptversion" ++ exit $? ++ ;; + --) # stop option processing + shift + break +@@ -50,30 +66,58 @@ + 0) exit 0 ;; + esac + ++# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and ++# mkdir -p a/c at the same time, both will detect that a is missing, ++# one will create a, then the other will try to create a and die with ++# a "File exists" error. This is a problem when calling mkinstalldirs ++# from a parallel make. We use --version in the probe to restrict ++# ourselves to GNU mkdir, which is thread-safe. + case $dirmode in + '') +- if mkdir -p -- . 2>/dev/null; then ++ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" ++ else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ test -d ./-p && rmdir ./-p ++ test -d ./--version && rmdir ./--version + fi + ;; + *) +- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ++ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && ++ test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" ++ else ++ # Clean up after NextStep and OpenStep mkdir. ++ for d in ./-m ./-p ./--version "./$dirmode"; ++ do ++ test -d $d && rmdir $d ++ done + fi + ;; + esac + + for file + do +- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ++ case $file in ++ /*) pathcomp=/ ;; ++ *) pathcomp= ;; ++ esac ++ oIFS=$IFS ++ IFS=/ ++ set fnord $file + shift ++ IFS=$oIFS + +- pathcomp= + for d + do +- pathcomp="$pathcomp$d" ++ test "x$d" = x && continue ++ ++ pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac +@@ -84,21 +128,21 @@ + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then +- errstatus=$lasterr ++ errstatus=$lasterr + else +- if test ! -z "$dirmode"; then ++ if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" +- lasterr="" +- chmod "$dirmode" "$pathcomp" || lasterr=$? ++ lasterr= ++ chmod "$dirmode" "$pathcomp" || lasterr=$? + +- if test ! -z "$lasterr"; then +- errstatus=$lasterr +- fi +- fi ++ if test ! -z "$lasterr"; then ++ errstatus=$lasterr ++ fi ++ fi + fi + fi + +- pathcomp="$pathcomp/" ++ pathcomp=$pathcomp/ + done + done + +@@ -107,5 +151,8 @@ + # Local Variables: + # mode: shell-script + # sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" + # End: +-# mkinstalldirs ends here +diff -Nrua a/admin/ylwrap b/admin/ylwrap +--- a/admin/ylwrap 2004-03-22 19:59:43.000000000 +0100 ++++ b/admin/ylwrap 2006-03-21 19:11:17.000000000 +0100 +@@ -1,6 +1,11 @@ + #! /bin/sh + # ylwrap - wrapper for lex/yacc invocations. +-# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc. ++ ++scriptversion=2005-05-14.22 ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# + # Written by Tom Tromey <tromey@cygnus.com>. + # + # This program is free software; you can redistribute it and/or modify +@@ -15,51 +20,73 @@ + # + # 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. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, 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. + +-# Usage: +-# ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]... +-# * INPUT is the input file +-# * OUTPUT is file PROG generates +-# * DESIRED is file we actually want +-# * PROGRAM is program to run +-# * ARGS are passed to PROG +-# Any number of OUTPUT,DESIRED pairs may be used. ++# This file is maintained in Automake, please report ++# bugs to <bug-automake@gnu.org> or send patches to ++# <automake-patches@gnu.org>. ++ ++case "$1" in ++ '') ++ echo "$0: No files given. Try \`$0 --help' for more information." 1>&2 ++ exit 1 ++ ;; ++ --basedir) ++ basedir=$2 ++ shift 2 ++ ;; ++ -h|--h*) ++ cat <<\EOF ++Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]... ++ ++Wrapper for lex/yacc invocations, renaming files as desired. ++ ++ INPUT is the input file ++ OUTPUT is one file PROG generates ++ DESIRED is the file we actually want instead of OUTPUT ++ PROGRAM is program to run ++ ARGS are passed to PROG ++ ++Any number of OUTPUT,DESIRED pairs may be used. ++ ++Report bugs to <bug-automake@gnu.org>. ++EOF ++ exit $? ++ ;; ++ -v|--v*) ++ echo "ylwrap $scriptversion" ++ exit $? ++ ;; ++esac ++ + + # The input. + input="$1" + shift + case "$input" in +- [\\/]* | ?:[\\/]*) ++ [\\/]* | ?:[\\/]*) + # Absolute path; do nothing. + ;; +- *) ++ *) + # Relative path. Make it absolute. + input="`pwd`/$input" + ;; + esac + +-# The directory holding the input. +-input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'` +-# Quote $INPUT_DIR so we can use it in a regexp. +-# FIXME: really we should care about more than `.' and `\'. +-input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'` +- +-echo "got $input_rx" +- + pairlist= + while test "$#" -ne 0; do +- if test "$1" = "--"; then +- shift +- break +- fi +- pairlist="$pairlist $1" +- shift ++ if test "$1" = "--"; then ++ shift ++ break ++ fi ++ pairlist="$pairlist $1" ++ shift + done + + # The program to run. +@@ -67,8 +94,8 @@ + shift + # Make any relative path in $prog absolute. + case "$prog" in +- [\\/]* | ?:[\\/]*) ;; +- *[\\/]*) prog="`pwd`/$prog" ;; ++ [\\/]* | ?:[\\/]*) ;; ++ *[\\/]*) prog="`pwd`/$prog" ;; + esac + + # FIXME: add hostname here for parallel makes that run commands on +@@ -79,65 +106,118 @@ + + cd $dirname + +-$prog ${1+"$@"} "$input" +-status=$? ++case $# in ++ 0) $prog "$input" ;; ++ *) $prog "$@" "$input" ;; ++esac ++ret=$? + +-if test $status -eq 0; then +- set X $pairlist +- shift +- first=yes +- # Since DOS filename conventions don't allow two dots, +- # the DOS version of Bison writes out y_tab.c instead of y.tab.c +- # and y_tab.h instead of y.tab.h. Test to see if this is the case. +- y_tab_nodot="no" +- if test -f y_tab.c || test -f y_tab.h; then +- y_tab_nodot="yes" +- fi +- +- while test "$#" -ne 0; do +- from="$1" +- # Handle y_tab.c and y_tab.h output by DOS +- if test $y_tab_nodot = "yes"; then +- if test $from = "y.tab.c"; then +- from="y_tab.c" +- else +- if test $from = "y.tab.h"; then +- from="y_tab.h" +- fi +- fi +- fi +- if test -f "$from"; then +- # If $2 is an absolute path name, then just use that, +- # otherwise prepend `../'. +- case "$2" in +- [\\/]* | ?:[\\/]*) target="$2";; +- *) target="../$2";; +- esac +- +- # Edit out `#line' or `#' directives. We don't want the +- # resulting debug information to point at an absolute srcdir; +- # it is better for it to just mention the .y file with no +- # path. +- sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$? ++if test $ret -eq 0; then ++ set X $pairlist ++ shift ++ first=yes ++ # Since DOS filename conventions don't allow two dots, ++ # the DOS version of Bison writes out y_tab.c instead of y.tab.c ++ # and y_tab.h instead of y.tab.h. Test to see if this is the case. ++ y_tab_nodot="no" ++ if test -f y_tab.c || test -f y_tab.h; then ++ y_tab_nodot="yes" ++ fi ++ ++ # The directory holding the input. ++ input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'` ++ # Quote $INPUT_DIR so we can use it in a regexp. ++ # FIXME: really we should care about more than `.' and `\'. ++ input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'` ++ ++ while test "$#" -ne 0; do ++ from="$1" ++ # Handle y_tab.c and y_tab.h output by DOS ++ if test $y_tab_nodot = "yes"; then ++ if test $from = "y.tab.c"; then ++ from="y_tab.c" + else +- # A missing file is only an error for the first file. This +- # is a blatant hack to let us support using "yacc -d". If -d +- # is not specified, we don't want an error when the header +- # file is "missing". +- if test $first = yes; then +- status=1 +- fi ++ if test $from = "y.tab.h"; then ++ from="y_tab.h" ++ fi + fi +- shift +- shift +- first=no +- done ++ fi ++ if test -f "$from"; then ++ # If $2 is an absolute path name, then just use that, ++ # otherwise prepend `../'. ++ case "$2" in ++ [\\/]* | ?:[\\/]*) target="$2";; ++ *) target="../$2";; ++ esac ++ ++ # We do not want to overwrite a header file if it hasn't ++ # changed. This avoid useless recompilations. However the ++ # parser itself (the first file) should always be updated, ++ # because it is the destination of the .y.c rule in the ++ # Makefile. Divert the output of all other files to a temporary ++ # file so we can compare them to existing versions. ++ if test $first = no; then ++ realtarget="$target" ++ target="tmp-`echo $target | sed s/.*[\\/]//g`" ++ fi ++ # Edit out `#line' or `#' directives. ++ # ++ # We don't want the resulting debug information to point at ++ # an absolute srcdir; it is better for it to just mention the ++ # .y file with no path. ++ # ++ # We want to use the real output file name, not yy.lex.c for ++ # instance. ++ # ++ # We want the include guards to be adjusted too. ++ FROM=`echo "$from" | sed \ ++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ ++ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` ++ TARGET=`echo "$2" | sed \ ++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ ++ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` ++ ++ sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \ ++ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$? ++ ++ # Check whether header files must be updated. ++ if test $first = no; then ++ if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then ++ echo "$2" is unchanged ++ rm -f "$target" ++ else ++ echo updating "$2" ++ mv -f "$target" "$realtarget" ++ fi ++ fi ++ else ++ # A missing file is only an error for the first file. This ++ # is a blatant hack to let us support using "yacc -d". If -d ++ # is not specified, we don't want an error when the header ++ # file is "missing". ++ if test $first = yes; then ++ ret=1 ++ fi ++ fi ++ shift ++ shift ++ first=no ++ done + else +- status=$? ++ ret=$? + fi + + # Remove the directory. + cd .. + rm -rf $dirname + +-exit $status ++exit $ret ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: |