From 05cb1a839347dce4b8a44ba14243eb8e90c4169b Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 6 Feb 2001 13:47:52 +0000 Subject: [PATCH] * autoheader.sh: Only set config_h for the first call to AC_CONFIG_HEADERS. --- ChangeLog | 5 +++++ autoheader.in | 6 +++--- autoheader.sh | 6 +++--- bin/autoheader.in | 6 +++--- man/autoheader.1 | 4 ++-- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2342331d..4c704e72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-02-05 Derek Price + + * autoheader.sh: Only set config_h for the first call to + AC_CONFIG_HEADERS. + 2001-02-05 Jim Meyering * acspecific.m4 (AC_SYS_LARGEFILE): Add ULL suffix to the diff --git a/autoheader.in b/autoheader.in index bac5d6f2..c0638d38 100644 --- a/autoheader.in +++ b/autoheader.in @@ -1,6 +1,6 @@ #! @SHELL@ # autoheader -- create `config.h.in' from `configure.ac' -# Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000 +# Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -52,7 +52,7 @@ version="\ autoheader (@PACKAGE_NAME@) @VERSION@ Written by Roland McGrath. -Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000 +Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -256,7 +256,7 @@ export autoconf_dir # Source what the traces are trying to tell us. $verbose $me: running $autoconf to trace from $infile >&2 $autoconf \ - --trace AC_CONFIG_HEADERS:'config_h="$1"' \ + --trace AC_CONFIG_HEADERS:': $${config_h="$1"}' \ --trace AH_OUTPUT:'ac_verbatim_$1="\ $2"' \ --trace AC_DEFINE_TRACE_LITERAL:'syms="$$syms $1"' \ diff --git a/autoheader.sh b/autoheader.sh index bac5d6f2..c0638d38 100644 --- a/autoheader.sh +++ b/autoheader.sh @@ -1,6 +1,6 @@ #! @SHELL@ # autoheader -- create `config.h.in' from `configure.ac' -# Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000 +# Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -52,7 +52,7 @@ version="\ autoheader (@PACKAGE_NAME@) @VERSION@ Written by Roland McGrath. -Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000 +Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -256,7 +256,7 @@ export autoconf_dir # Source what the traces are trying to tell us. $verbose $me: running $autoconf to trace from $infile >&2 $autoconf \ - --trace AC_CONFIG_HEADERS:'config_h="$1"' \ + --trace AC_CONFIG_HEADERS:': $${config_h="$1"}' \ --trace AH_OUTPUT:'ac_verbatim_$1="\ $2"' \ --trace AC_DEFINE_TRACE_LITERAL:'syms="$$syms $1"' \ diff --git a/bin/autoheader.in b/bin/autoheader.in index bac5d6f2..c0638d38 100644 --- a/bin/autoheader.in +++ b/bin/autoheader.in @@ -1,6 +1,6 @@ #! @SHELL@ # autoheader -- create `config.h.in' from `configure.ac' -# Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000 +# Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -52,7 +52,7 @@ version="\ autoheader (@PACKAGE_NAME@) @VERSION@ Written by Roland McGrath. -Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000 +Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -256,7 +256,7 @@ export autoconf_dir # Source what the traces are trying to tell us. $verbose $me: running $autoconf to trace from $infile >&2 $autoconf \ - --trace AC_CONFIG_HEADERS:'config_h="$1"' \ + --trace AC_CONFIG_HEADERS:': $${config_h="$1"}' \ --trace AH_OUTPUT:'ac_verbatim_$1="\ $2"' \ --trace AC_DEFINE_TRACE_LITERAL:'syms="$$syms $1"' \ diff --git a/man/autoheader.1 b/man/autoheader.1 index 98b4663c..e52fbcff 100644 --- a/man/autoheader.1 +++ b/man/autoheader.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH AUTOHEADER "1" "January 2001" "GNU Autoconf 2.49d" FSF +.TH AUTOHEADER "1" "February 2001" "GNU Autoconf 2.49d" FSF .SH NAME autoheader \- Create a template header for configure .SH SYNOPSIS @@ -50,7 +50,7 @@ location of `aclocal.m4' and `acconfig.h' .SH AUTHOR Written by Roland McGrath. .PP -Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000 +Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.