From: Ben Elliston Date: Sun, 21 Mar 1999 13:54:14 +0000 (+0000) Subject: 1999-03-22 Pavel Roskin X-Git-Tag: experimental-branchpoint~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0ffe3d0702950f6d4336ee6df27666c3f1fb0a4;p=thirdparty%2Fautoconf.git 1999-03-22 Pavel Roskin * autoheader.sh: Report an error if AC_CONFIG_HEADER is not present in the configure input file. --- diff --git a/ChangeLog b/ChangeLog index f2638e89..75a6a994 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-03-22 Pavel Roskin + + * autoheader.sh: Report an error if AC_CONFIG_HEADER is not + present in the configure input file. + 1999-03-21 Ben Elliston * config.guess: Correct typo for detecting ELF on FreeBSD. diff --git a/autoheader.in b/autoheader.in index 20eabaed..67f642fb 100644 --- a/autoheader.in +++ b/autoheader.in @@ -108,7 +108,7 @@ case $# in *) echo "$usage" >&2; exit 1 ;; esac -config_h=config.h +config_h=undefined syms= types= funcs= @@ -150,19 +150,20 @@ eval "`$M4 -I$AC_MACRODIR $use_localdir $r autoheader.m4$f $infile | # is a substring of it. syms="`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'`" -if test $# -eq 0; then - tmpout=autoh$$ - trap "rm -f $tmpout; exit 1" 1 2 15 - exec > $tmpout -fi - # Support "outfile[:infile]", defaulting infile="outfile.in". case "$config_h" in +undefined) echo "error: AC_CONFIG_HEADER not found in $infile" >&2; exit 1 ;; *:*) config_h_in=`echo "$config_h"|sed 's%.*:%%'` config_h=`echo "$config_h"|sed 's%:.*%%'` ;; *) config_h_in="${config_h}.in" ;; esac +if test $# -eq 0; then + tmpout=autoh$$ + trap "rm -f $tmpout; exit 1" 1 2 15 + exec > $tmpout +fi + # Don't write "do not edit" -- it will get copied into the # config.h, which it's ok to edit. cat <&2; exit 1 ;; esac -config_h=config.h +config_h=undefined syms= types= funcs= @@ -150,19 +150,20 @@ eval "`$M4 -I$AC_MACRODIR $use_localdir $r autoheader.m4$f $infile | # is a substring of it. syms="`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'`" -if test $# -eq 0; then - tmpout=autoh$$ - trap "rm -f $tmpout; exit 1" 1 2 15 - exec > $tmpout -fi - # Support "outfile[:infile]", defaulting infile="outfile.in". case "$config_h" in +undefined) echo "error: AC_CONFIG_HEADER not found in $infile" >&2; exit 1 ;; *:*) config_h_in=`echo "$config_h"|sed 's%.*:%%'` config_h=`echo "$config_h"|sed 's%:.*%%'` ;; *) config_h_in="${config_h}.in" ;; esac +if test $# -eq 0; then + tmpout=autoh$$ + trap "rm -f $tmpout; exit 1" 1 2 15 + exec > $tmpout +fi + # Don't write "do not edit" -- it will get copied into the # config.h, which it's ok to edit. cat <&2; exit 1 ;; esac -config_h=config.h +config_h=undefined syms= types= funcs= @@ -150,19 +150,20 @@ eval "`$M4 -I$AC_MACRODIR $use_localdir $r autoheader.m4$f $infile | # is a substring of it. syms="`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'`" -if test $# -eq 0; then - tmpout=autoh$$ - trap "rm -f $tmpout; exit 1" 1 2 15 - exec > $tmpout -fi - # Support "outfile[:infile]", defaulting infile="outfile.in". case "$config_h" in +undefined) echo "error: AC_CONFIG_HEADER not found in $infile" >&2; exit 1 ;; *:*) config_h_in=`echo "$config_h"|sed 's%.*:%%'` config_h=`echo "$config_h"|sed 's%:.*%%'` ;; *) config_h_in="${config_h}.in" ;; esac +if test $# -eq 0; then + tmpout=autoh$$ + trap "rm -f $tmpout; exit 1" 1 2 15 + exec > $tmpout +fi + # Don't write "do not edit" -- it will get copied into the # config.h, which it's ok to edit. cat <