]>
Commit | Line | Data |
---|---|---|
45a4c49b | 1 | --- autoconf-2.13/autoconf.sh~ Fri Mar 26 20:50:48 1999 |
2 | +++ autoconf-2.13/autoconf.sh Fri Mar 26 20:58:22 1999 | |
3 | @@ -52,13 +52,13 @@ | |
4 | while test $# -gt 0 ; do | |
5 | case "${1}" in | |
6 | -h | --help | --h* ) | |
7 | - echo "${usage}" 1>&2; exit 0 ;; | |
8 | + echo "${usage}" 1>&2; rm -f $tmpout ; exit 0 ;; | |
9 | --localdir=* | --l*=* ) | |
10 | localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" | |
11 | shift ;; | |
12 | -l | --localdir | --l*) | |
13 | shift | |
14 | - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } | |
15 | + test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } | |
16 | localdir="${1}" | |
17 | shift ;; | |
18 | --macrodir=* | --m*=* ) | |
19 | @@ -66,7 +66,7 @@ | |
20 | shift ;; | |
21 | -m | --macrodir | --m* ) | |
22 | shift | |
23 | - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } | |
24 | + test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } | |
25 | AC_MACRODIR="${1}" | |
26 | shift ;; | |
27 | --version | --v* ) | |
28 | @@ -76,7 +76,7 @@ | |
29 | - ) # Use stdin as input. | |
30 | break ;; | |
31 | -* ) | |
32 | - echo "${usage}" 1>&2; exit 1 ;; | |
33 | + echo "${usage}" 1>&2; rm -f $tmpout; exit 1 ;; | |
34 | * ) | |
35 | break ;; | |
36 | esac | |
37 | @@ -86,13 +86,14 @@ | |
38 | version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ | |
39 | $AC_MACRODIR/acgeneral.m4` | |
40 | echo "Autoconf version $version" | |
41 | + rm -f $tmpout | |
42 | exit 0 | |
43 | fi | |
44 | ||
45 | case $# in | |
46 | 0) infile=configure.in ;; | |
47 | 1) infile="$1" ;; | |
48 | - *) echo "$usage" >&2; exit 1 ;; | |
49 | + *) echo "$usage" >&2; rm -f $tmpout; exit 1 ;; | |
50 | esac | |
51 | ||
52 | trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15 | |
53 | @@ -103,6 +104,7 @@ | |
54 | infile=$tmpin | |
55 | elif test ! -r "$infile"; then | |
56 | echo "autoconf: ${infile}: No such file or directory" >&2 | |
57 | + rm -f $tmpin $tmpout | |
58 | exit 1 | |
59 | fi | |
60 | ||
61 | @@ -111,6 +113,8 @@ | |
62 | else | |
63 | use_localdir= | |
64 | fi | |
65 | +# Make sure we don't leave those around - they are annoying | |
66 | +trap 'rm -f $tmpin $tmpout' 0 | |
67 | ||
68 | # Use the frozen version of Autoconf if available. | |
69 | r= f= | |
70 | @@ -118,7 +122,7 @@ | |
71 | case `$M4 --help < /dev/null 2>&1` in | |
72 | *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; | |
73 | *traditional*) ;; | |
74 | -*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; | |
75 | +*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;; | |
76 | esac | |
77 | ||
78 | $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || | |
79 | @@ -154,6 +158,6 @@ | |
80 | /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ | |
81 | ' >&4 | |
82 | ||
83 | -rm -f $tmpout | |
84 | +rm -f $tmpout $tmpin | |
85 | ||
86 | exit $status | |
87 | --- autoconf-2.13/autoupdate.sh~ Fri Mar 26 20:50:48 1999 | |
88 | +++ autoconf-2.13/autoupdate.sh Fri Mar 26 21:02:18 1999 | |
89 | @@ -35,13 +35,13 @@ | |
90 | while test $# -gt 0 ; do | |
91 | case "${1}" in | |
92 | -h | --help | --h* ) | |
93 | - echo "${usage}" 1>&2; exit 0 ;; | |
94 | + echo "${usage}" 1>&2; rm -f $sedtmp; exit 0 ;; | |
95 | --macrodir=* | --m*=* ) | |
96 | AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" | |
97 | shift ;; | |
98 | -m | --macrodir | --m* ) | |
99 | shift | |
100 | - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } | |
101 | + test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $sedtmp; exit 1; } | |
102 | AC_MACRODIR="${1}" | |
103 | shift ;; | |
104 | --version | --versio | --versi | --vers) | |
105 | @@ -51,7 +51,7 @@ | |
106 | - ) # Use stdin as input. | |
107 | break ;; | |
108 | -* ) | |
109 | - echo "${usage}" 1>&2; exit 1 ;; | |
110 | + echo "${usage}" 1>&2; rm -f $sedtmp; exit 1 ;; | |
111 | * ) | |
112 | break ;; | |
113 | esac | |
114 | @@ -61,6 +61,7 @@ | |
115 | version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ | |
116 | $AC_MACRODIR/acgeneral.m4` | |
117 | echo "Autoconf version $version" | |
118 | + rm -f $sedtmp | |
119 | exit 0 | |
120 | fi | |
121 | ||
122 | @@ -68,6 +69,7 @@ | |
123 | ||
124 | tmpout=acupo.$$ | |
125 | trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15 | |
126 | +trap 'rm -f $sedtmp' 0 | |
127 | case $# in | |
128 | 0) infile=configure.in; out="> $tmpout" | |
129 | # Make sure $infile can be read, and $tmpout has the same permissions. |