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