|
 |
d9d0ed |
--- autoconf-2.13/autoconf.sh~ Fri Mar 26 20:50:48 1999
|
|
|
d9d0ed |
+++ autoconf-2.13/autoconf.sh Fri Mar 26 20:58:22 1999
|
|
|
d9d0ed |
@@ -52,13 +52,13 @@
|
|
|
d9d0ed |
while test $# -gt 0 ; do
|
|
|
d9d0ed |
case "${1}" in
|
|
|
d9d0ed |
-h | --help | --h* )
|
|
|
d9d0ed |
- echo "${usage}" 1>&2; exit 0 ;;
|
|
|
d9d0ed |
+ echo "${usage}" 1>&2; rm -f $tmpout ; exit 0 ;;
|
|
|
d9d0ed |
--localdir=* | --l*=* )
|
|
|
d9d0ed |
localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
|
|
|
d9d0ed |
shift ;;
|
|
|
d9d0ed |
-l | --localdir | --l*)
|
|
|
d9d0ed |
shift
|
|
|
d9d0ed |
- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
|
|
|
d9d0ed |
+ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; }
|
|
|
d9d0ed |
localdir="${1}"
|
|
|
d9d0ed |
shift ;;
|
|
|
d9d0ed |
--macrodir=* | --m*=* )
|
|
|
d9d0ed |
@@ -66,7 +66,7 @@
|
|
|
d9d0ed |
shift ;;
|
|
|
d9d0ed |
-m | --macrodir | --m* )
|
|
|
d9d0ed |
shift
|
|
|
d9d0ed |
- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
|
|
|
d9d0ed |
+ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; }
|
|
|
d9d0ed |
AC_MACRODIR="${1}"
|
|
|
d9d0ed |
shift ;;
|
|
|
d9d0ed |
--version | --v* )
|
|
|
d9d0ed |
@@ -76,7 +76,7 @@
|
|
|
d9d0ed |
- ) # Use stdin as input.
|
|
|
d9d0ed |
break ;;
|
|
|
d9d0ed |
-* )
|
|
|
d9d0ed |
- echo "${usage}" 1>&2; exit 1 ;;
|
|
|
d9d0ed |
+ echo "${usage}" 1>&2; rm -f $tmpout; exit 1 ;;
|
|
|
d9d0ed |
* )
|
|
|
d9d0ed |
break ;;
|
|
|
d9d0ed |
esac
|
|
|
d9d0ed |
@@ -86,13 +86,14 @@
|
|
|
d9d0ed |
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
|
|
|
d9d0ed |
$AC_MACRODIR/acgeneral.m4`
|
|
|
d9d0ed |
echo "Autoconf version $version"
|
|
|
d9d0ed |
+ rm -f $tmpout
|
|
|
d9d0ed |
exit 0
|
|
|
d9d0ed |
fi
|
|
|
d9d0ed |
|
|
|
d9d0ed |
case $# in
|
|
|
d9d0ed |
0) infile=configure.in ;;
|
|
|
d9d0ed |
1) infile="$1" ;;
|
|
|
d9d0ed |
- *) echo "$usage" >&2; exit 1 ;;
|
|
|
d9d0ed |
+ *) echo "$usage" >&2; rm -f $tmpout; exit 1 ;;
|
|
|
d9d0ed |
esac
|
|
|
d9d0ed |
|
|
|
d9d0ed |
trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
|
|
|
d9d0ed |
@@ -103,6 +104,7 @@
|
|
|
d9d0ed |
infile=$tmpin
|
|
|
d9d0ed |
elif test ! -r "$infile"; then
|
|
|
d9d0ed |
echo "autoconf: ${infile}: No such file or directory" >&2
|
|
|
d9d0ed |
+ rm -f $tmpin $tmpout
|
|
|
d9d0ed |
exit 1
|
|
|
d9d0ed |
fi
|
|
|
d9d0ed |
|
|
|
d9d0ed |
@@ -111,6 +113,8 @@
|
|
|
d9d0ed |
else
|
|
|
d9d0ed |
use_localdir=
|
|
|
d9d0ed |
fi
|
|
|
d9d0ed |
+# Make sure we don't leave those around - they are annoying
|
|
|
d9d0ed |
+trap 'rm -f $tmpin $tmpout' 0
|
|
|
d9d0ed |
|
|
|
d9d0ed |
# Use the frozen version of Autoconf if available.
|
|
|
d9d0ed |
r= f=
|
|
|
d9d0ed |
@@ -118,7 +122,7 @@
|
|
|
d9d0ed |
case `$M4 --help < /dev/null 2>&1` in
|
|
|
d9d0ed |
*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
|
|
|
d9d0ed |
*traditional*) ;;
|
|
|
d9d0ed |
-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
|
|
|
d9d0ed |
+*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;;
|
|
|
d9d0ed |
esac
|
|
|
d9d0ed |
|
|
|
d9d0ed |
$M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
|
|
|
d9d0ed |
@@ -154,6 +158,6 @@
|
|
|
d9d0ed |
/__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
|
|
|
d9d0ed |
' >&4
|
|
|
d9d0ed |
|
|
|
d9d0ed |
-rm -f $tmpout
|
|
|
d9d0ed |
+rm -f $tmpout $tmpin
|
|
|
d9d0ed |
|
|
|
d9d0ed |
exit $status
|
|
|
d9d0ed |
--- autoconf-2.13/autoupdate.sh~ Fri Mar 26 20:50:48 1999
|
|
|
d9d0ed |
+++ autoconf-2.13/autoupdate.sh Fri Mar 26 21:02:18 1999
|
|
|
d9d0ed |
@@ -35,13 +35,13 @@
|
|
|
d9d0ed |
while test $# -gt 0 ; do
|
|
|
d9d0ed |
case "${1}" in
|
|
|
d9d0ed |
-h | --help | --h* )
|
|
|
d9d0ed |
- echo "${usage}" 1>&2; exit 0 ;;
|
|
|
d9d0ed |
+ echo "${usage}" 1>&2; rm -f $sedtmp; exit 0 ;;
|
|
|
d9d0ed |
--macrodir=* | --m*=* )
|
|
|
d9d0ed |
AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
|
|
|
d9d0ed |
shift ;;
|
|
|
d9d0ed |
-m | --macrodir | --m* )
|
|
|
d9d0ed |
shift
|
|
|
d9d0ed |
- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
|
|
|
d9d0ed |
+ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $sedtmp; exit 1; }
|
|
|
d9d0ed |
AC_MACRODIR="${1}"
|
|
|
d9d0ed |
shift ;;
|
|
|
d9d0ed |
--version | --versio | --versi | --vers)
|
|
|
d9d0ed |
@@ -51,7 +51,7 @@
|
|
|
d9d0ed |
- ) # Use stdin as input.
|
|
|
d9d0ed |
break ;;
|
|
|
d9d0ed |
-* )
|
|
|
d9d0ed |
- echo "${usage}" 1>&2; exit 1 ;;
|
|
|
d9d0ed |
+ echo "${usage}" 1>&2; rm -f $sedtmp; exit 1 ;;
|
|
|
d9d0ed |
* )
|
|
|
d9d0ed |
break ;;
|
|
|
d9d0ed |
esac
|
|
|
d9d0ed |
@@ -61,6 +61,7 @@
|
|
|
d9d0ed |
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
|
|
|
d9d0ed |
$AC_MACRODIR/acgeneral.m4`
|
|
|
d9d0ed |
echo "Autoconf version $version"
|
|
|
d9d0ed |
+ rm -f $sedtmp
|
|
|
d9d0ed |
exit 0
|
|
|
d9d0ed |
fi
|
|
|
d9d0ed |
|
|
|
d9d0ed |
@@ -68,6 +69,7 @@
|
|
|
d9d0ed |
|
|
|
d9d0ed |
tmpout=acupo.$$
|
|
|
d9d0ed |
trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
|
|
|
d9d0ed |
+trap 'rm -f $sedtmp' 0
|
|
|
d9d0ed |
case $# in
|
|
|
d9d0ed |
0) infile=configure.in; out="> $tmpout"
|
|
|
d9d0ed |
# Make sure $infile can be read, and $tmpout has the same permissions.
|