b6b38a6131
Regen patches properly.
34 lines
1.3 KiB
Plaintext
34 lines
1.3 KiB
Plaintext
$OpenBSD: patch-autoheader_sh,v 1.5 2004/07/24 15:48:49 espie Exp $
|
|
--- autoheader.sh.orig Sat Jul 24 17:38:42 2004
|
|
+++ autoheader.sh Sat Jul 24 17:38:55 2004
|
|
@@ -110,19 +110,10 @@ else
|
|
use_localdir=
|
|
fi
|
|
|
|
-# Use the frozen version of Autoconf if available.
|
|
-r= f=
|
|
-# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
|
|
-case `$M4 --help < /dev/null 2>&1` in
|
|
-*reload-state*) test -r $AC_MACRODIR/autoheader.m4f && { r=--reload f=f; } ;;
|
|
-*traditional*) ;;
|
|
-*) echo Autoconf requires GNU m4 1.1 or later >&2; exit 1 ;;
|
|
-esac
|
|
-
|
|
# Extract assignments of SYMS, TYPES, FUNCS, HEADERS, and LIBS from the
|
|
# modified autoconf processing of the input file. The sed hair is
|
|
# necessary to win for multi-line macro invocations.
|
|
-eval "`$M4 -I$AC_MACRODIR $use_localdir $r autoheader.m4$f $infile |
|
|
+eval "`$M4 -g -D__gnu__ -I$AC_MACRODIR $use_localdir autoheader.m4 $infile |
|
|
sed -n -e '
|
|
: again
|
|
/^@@@.*@@@$/s/^@@@\(.*\)@@@$/\1/p
|
|
@@ -194,7 +185,7 @@ if test -n "$syms"; then
|
|
# Some fgrep's have limits on the number of lines that can be in the
|
|
# pattern on the command line, so use a temporary file containing the
|
|
# pattern.
|
|
- (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
|
|
+ (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
|
|
trap "rm -f $fgrep_tmp; exit 1" 1 2 15
|
|
cat > $fgrep_tmp <<EOF
|
|
$syms
|