mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-03-19 14:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

1999-10-31 Akim Demaille <akim@epita.fr>

Browse Source 
Fix the --version of all the executables.

	* Makefile.am (editsh, editpl): Substitute also PACKAGE and
	VERSION.
	* autoconf.sh (version): New string.
	(--version): Use it.
	(--help) Output on stdout, not stderr.
	* autoheader.sh: Likewise.
	* autoreconf.sh: Likewise.
	* autoscan.pl: Likewise.
	* autoupdate.sh: Likewise.
	* ifnames.sh: Likewise.
This commit is contained in:
Akim Demaille 2000-01-10 10:11:57 +00:00
parent ecb19983da
commit d2750f1138
18 changed files with 188 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
1999-10-31 Akim Demaille <akim@epita.fr>
Fix the --version of all the executables.
* Makefile.am (editsh, editpl): Substitute also PACKAGE and
VERSION.
* autoconf.sh (version): New string.
(--version): Use it.
(--help) Output on stdout, not stderr.
* autoheader.sh: Likewise.
* autoreconf.sh: Likewise.
* autoscan.pl: Likewise.
* autoupdate.sh: Likewise.
* ifnames.sh: Likewise.
1999-10-31 Akim Demaille <akim@epita.fr>
Perform a better checking for missing templates in autoheader.

6
Makefile.am
View File

@ -77,8 +77,10 @@ install-data-hook: INSTALL.txt
editsh = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e \
's,@''M4''@,$(M4),g' -e 's,@''AWK''@,$(AWK),g' \
-e 's,@''SHELL''@,$(SHELL),g'
editpl = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e 's,@''PERL''@,$(PERL),g'
-e 's,@''SHELL''@,$(SHELL),g' \
-e 's,@''VERSION''@,$(VERSION),g' -e 's,@''PACKAGE''@,$(PACKAGE),g'
editpl = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e 's,@''PERL''@,$(PERL),g' \
-e 's,@''VERSION''@,$(VERSION),g' -e 's,@''PACKAGE''@,$(PACKAGE),g'
.sh:
rm -f $@ $@.tmp

20
autoconf.in
View File

@ -35,6 +35,14 @@ TEMPLATE-FILE is given, else into \`configure'.
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoconf (GNU @PACKAGE@) @VERSION@
Written by David J. MacKenzie.
Copyright (C) 1992, 1993, 1994, 1996, 1999 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."
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -57,12 +65,11 @@ esac
: ${TMPDIR=/tmp}
tmpout=${TMPDIR}/acout.$$
localdir=
show_version=no
while test $# -gt 0 ; do
case "${1}" in
-h | --help | --h* )
echo "${usage}" 1>&2; exit 0 ;;
echo "${usage}"; exit 0 ;;
--localdir=* | --l*=* )
localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
shift ;;
@ -80,7 +87,7 @@ while test $# -gt 0 ; do
AC_MACRODIR="${1}"
shift ;;
--version | --v* )
show_version=yes; shift ;;
echo "$version" ; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@ -92,13 +99,6 @@ while test $# -gt 0 ; do
esac
done
if test $show_version = yes; then
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
$AC_MACRODIR/acgeneral.m4`
echo "Autoconf version $version"
exit 0
fi
case $# in
0) infile=configure.in ;;
1) infile="$1" ;;

20
autoconf.sh
View File

@ -35,6 +35,14 @@ TEMPLATE-FILE is given, else into \`configure'.
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoconf (GNU @PACKAGE@) @VERSION@
Written by David J. MacKenzie.
Copyright (C) 1992, 1993, 1994, 1996, 1999 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."
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -57,12 +65,11 @@ esac
: ${TMPDIR=/tmp}
tmpout=${TMPDIR}/acout.$$
localdir=
show_version=no
while test $# -gt 0 ; do
case "${1}" in
-h | --help | --h* )
echo "${usage}" 1>&2; exit 0 ;;
echo "${usage}"; exit 0 ;;
--localdir=* | --l*=* )
localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
shift ;;
@ -80,7 +87,7 @@ while test $# -gt 0 ; do
AC_MACRODIR="${1}"
shift ;;
--version | --v* )
show_version=yes; shift ;;
echo "$version" ; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@ -92,13 +99,6 @@ while test $# -gt 0 ; do
esac
done
if test $show_version = yes; then
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
$AC_MACRODIR/acgeneral.m4`
echo "Autoconf version $version"
exit 0
fi
case $# in
0) infile=configure.in ;;
1) infile="$1" ;;

24
autoheader.in
View File

@ -1,6 +1,6 @@
#! @SHELL@
# autoheader -- create `config.h.in' from `configure.in'
# Copyright (C) 1992, 1993, 1994, 1996, 1998, 1999 Free Software Foundation, Inc.
# Copyright (C) 1992-1994, 1996, 1998-1999 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -39,6 +39,14 @@ given.
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoheader (GNU @PACKAGE@) @VERSION@
Written by Roland McGrath.
Copyright (C) 1992-1994, 1996, 1998-1999 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."
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -67,7 +75,6 @@ esac
ac_LF_and_DOT="`echo; echo .`"
localdir=.
show_version=no
debug=0
# Basename for temporary files.
ah_base=autoh$$
@ -75,7 +82,7 @@ ah_base=autoh$$
while test $# -gt 0 ; do
case "${1}" in
-h | --help | --h* )
echo "${usage}"; exit 0 ;;
echo "$usage"; exit 0 ;;
-d | --debug | --d* )
debug=1; shift ;;
--localdir=* | --l*=* )
@ -95,7 +102,7 @@ while test $# -gt 0 ; do
AC_MACRODIR="${1}"
shift ;;
--version | --v* )
show_version=yes; shift ;;
echo "$version"; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@ -107,13 +114,6 @@ while test $# -gt 0 ; do
esac
done
if test $show_version = yes; then
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
$AC_MACRODIR/acgeneral.m4`
echo "Autoconf version $version"
exit 0
fi
acconfigs="${AC_MACRODIR}/acconfig.h"
test -r $localdir/acconfig.h && acconfigs="${acconfigs} $localdir/acconfig.h"
@ -177,7 +177,7 @@ undefined) echo "error: AC_CONFIG_HEADER not found in $infile" >&2; exit 1 ;;
esac
tmpout=$ah_base.out
if test $debug -eq 0; then trap "rm -f $ah_base*; exit 1" 1 2 15; fi
if test $debug -eq 0; then trap "rm -f $ah_base*; exit 1" 1 2 15; fi
# Don't write "do not edit" -- it will get copied into the
# config.h, which it's ok to edit.
cat <<EOF >$tmpout

24
autoheader.sh
View File

@ -1,6 +1,6 @@
#! @SHELL@
# autoheader -- create `config.h.in' from `configure.in'
# Copyright (C) 1992, 1993, 1994, 1996, 1998, 1999 Free Software Foundation, Inc.
# Copyright (C) 1992-1994, 1996, 1998-1999 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -39,6 +39,14 @@ given.
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoheader (GNU @PACKAGE@) @VERSION@
Written by Roland McGrath.
Copyright (C) 1992-1994, 1996, 1998-1999 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."
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -67,7 +75,6 @@ esac
ac_LF_and_DOT="`echo; echo .`"
localdir=.
show_version=no
debug=0
# Basename for temporary files.
ah_base=autoh$$
@ -75,7 +82,7 @@ ah_base=autoh$$
while test $# -gt 0 ; do
case "${1}" in
-h | --help | --h* )
echo "${usage}"; exit 0 ;;
echo "$usage"; exit 0 ;;
-d | --debug | --d* )
debug=1; shift ;;
--localdir=* | --l*=* )
@ -95,7 +102,7 @@ while test $# -gt 0 ; do
AC_MACRODIR="${1}"
shift ;;
--version | --v* )
show_version=yes; shift ;;
echo "$version"; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@ -107,13 +114,6 @@ while test $# -gt 0 ; do
esac
done
if test $show_version = yes; then
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
$AC_MACRODIR/acgeneral.m4`
echo "Autoconf version $version"
exit 0
fi
acconfigs="${AC_MACRODIR}/acconfig.h"
test -r $localdir/acconfig.h && acconfigs="${acconfigs} $localdir/acconfig.h"
@ -177,7 +177,7 @@ undefined) echo "error: AC_CONFIG_HEADER not found in $infile" >&2; exit 1 ;;
esac
tmpout=$ah_base.out
if test $debug -eq 0; then trap "rm -f $ah_base*; exit 1" 1 2 15; fi
if test $debug -eq 0; then trap "rm -f $ah_base*; exit 1" 1 2 15; fi
# Don't write "do not edit" -- it will get copied into the
# config.h, which it's ok to edit.
cat <<EOF >$tmpout

20
autoreconf.in
View File

@ -1,6 +1,6 @@
#! @SHELL@
# autoreconf - remake all Autoconf configure scripts in a directory tree
# Copyright (C) 1994 Free Software Foundation, Inc.
# Copyright (C) 1994, 1999 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -44,9 +44,16 @@ The following options are passed to \`automake':
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoreconf (GNU @PACKAGE@) @VERSION@
Written by David J. MacKenzie.
Copyright (C) 1994, 1999 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."
localdir=
verbose=:
show_version=no
force=no
automake_mode=--gnu
automake_deps=
@ -78,7 +85,7 @@ while test $# -gt 0; do
-f | --force)
force=yes; shift ;;
--version | --vers*)
show_version=yes; shift ;;
echo "$version"; exit 0 ;;
--cygnus | --foreign | --gnits | --gnu)
automake_mode=$1; shift ;;
--include-deps | -i)
@ -90,13 +97,6 @@ while test $# -gt 0; do
esac
done
if test $show_version = yes; then
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
$AC_MACRODIR/acgeneral.m4`
echo "Autoconf version $version"
exit 0
fi
if test $# -ne 0; then
echo "$usage" 1>&2; exit 1
fi

20
autoreconf.sh
View File

@ -1,6 +1,6 @@
#! @SHELL@
# autoreconf - remake all Autoconf configure scripts in a directory tree
# Copyright (C) 1994 Free Software Foundation, Inc.
# Copyright (C) 1994, 1999 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -44,9 +44,16 @@ The following options are passed to \`automake':
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoreconf (GNU @PACKAGE@) @VERSION@
Written by David J. MacKenzie.
Copyright (C) 1994, 1999 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."
localdir=
verbose=:
show_version=no
force=no
automake_mode=--gnu
automake_deps=
@ -78,7 +85,7 @@ while test $# -gt 0; do
-f | --force)
force=yes; shift ;;
--version | --vers*)
show_version=yes; shift ;;
echo "$version"; exit 0 ;;
--cygnus | --foreign | --gnits | --gnu)
automake_mode=$1; shift ;;
--include-deps | -i)
@ -90,13 +97,6 @@ while test $# -gt 0; do
esac
done
if test $show_version = yes; then
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
$AC_MACRODIR/acgeneral.m4`
echo "Autoconf version $version"
exit 0
fi
if test $# -ne 0; then
echo "$usage" 1>&2; exit 1
fi

30
autoscan.in
View File

@ -53,6 +53,15 @@ is a preliminary `configure.in' for that package.
--version print version number, then exit
Report bugs to <bug-autoconf@gnu.org>.
EOD
local ($version) = <<'EOD';
autoscan (GNU @PACKAGE@) @VERSION@
Written by David J. MacKenzie.
Copyright (C) 1994, 1999 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."
EOD
foreach $_ (@ARGV) {
@ -64,7 +73,8 @@ EOD
} elsif (/^--verb/) {
$verbose = 1;
} elsif (/^--vers/) {
&version;
print "$version";
exit 0;
} elsif (/^[^-]/) {
die "$usage" if defined($srcdir);
# Top level directory of the package being autoscanned.
@ -83,20 +93,6 @@ EOD
die "$0: cannot create configure.scan: $!\n";
}
# Print the version number and exit.
sub version
{
open(ACG, "<$datadir/acgeneral.m4") ||
die "$0: cannot open $datadir/acgeneral.m4: $!\n";
while (<ACG>) {
if (/define.AC_ACVERSION.\s*([0-9.]+)/) {
print "Autoconf version $1\n";
exit 0;
}
}
die "Autoconf version unknown\n";
}
# Put values in the tables of what to do with each token.
sub init_tables
{
@ -373,7 +369,7 @@ sub output_headers
if (defined($headers_macros{$word}) &&
$headers_macros{$word} eq 'AC_CHECK_HEADERS') {
push(@have_headers, $word);
} else {
} else {
&print_unique($headers_macros{$word});
}
}
@ -400,7 +396,7 @@ sub output_functions
if (defined($functions_macros{$word}) &&
$functions_macros{$word} eq 'AC_CHECK_FUNCS') {
push(@have_funcs, $word);
} else {
} else {
&print_unique($functions_macros{$word});
}
}

30
autoscan.pl
View File

@ -53,6 +53,15 @@ is a preliminary `configure.in' for that package.
--version print version number, then exit
Report bugs to <bug-autoconf@gnu.org>.
EOD
local ($version) = <<'EOD';
autoscan (GNU @PACKAGE@) @VERSION@
Written by David J. MacKenzie.
Copyright (C) 1994, 1999 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."
EOD
foreach $_ (@ARGV) {
@ -64,7 +73,8 @@ EOD
} elsif (/^--verb/) {
$verbose = 1;
} elsif (/^--vers/) {
&version;
print "$version";
exit 0;
} elsif (/^[^-]/) {
die "$usage" if defined($srcdir);
# Top level directory of the package being autoscanned.
@ -83,20 +93,6 @@ EOD
die "$0: cannot create configure.scan: $!\n";
}
# Print the version number and exit.
sub version
{
open(ACG, "<$datadir/acgeneral.m4") ||
die "$0: cannot open $datadir/acgeneral.m4: $!\n";
while (<ACG>) {
if (/define.AC_ACVERSION.\s*([0-9.]+)/) {
print "Autoconf version $1\n";
exit 0;
}
}
die "Autoconf version unknown\n";
}
# Put values in the tables of what to do with each token.
sub init_tables
{
@ -373,7 +369,7 @@ sub output_headers
if (defined($headers_macros{$word}) &&
$headers_macros{$word} eq 'AC_CHECK_HEADERS') {
push(@have_headers, $word);
} else {
} else {
&print_unique($headers_macros{$word});
}
}
@ -400,7 +396,7 @@ sub output_functions
if (defined($functions_macros{$word}) &&
$functions_macros{$word} eq 'AC_CHECK_FUNCS') {
push(@have_funcs, $word);
} else {
} else {
&print_unique($functions_macros{$word});
}
}

20
bin/autoconf.in
View File

@ -35,6 +35,14 @@ TEMPLATE-FILE is given, else into \`configure'.
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoconf (GNU @PACKAGE@) @VERSION@
Written by David J. MacKenzie.
Copyright (C) 1992, 1993, 1994, 1996, 1999 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."
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -57,12 +65,11 @@ esac
: ${TMPDIR=/tmp}
tmpout=${TMPDIR}/acout.$$
localdir=
show_version=no
while test $# -gt 0 ; do
case "${1}" in
-h | --help | --h* )
echo "${usage}" 1>&2; exit 0 ;;
echo "${usage}"; exit 0 ;;
--localdir=* | --l*=* )
localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
shift ;;
@ -80,7 +87,7 @@ while test $# -gt 0 ; do
AC_MACRODIR="${1}"
shift ;;
--version | --v* )
show_version=yes; shift ;;
echo "$version" ; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@ -92,13 +99,6 @@ while test $# -gt 0 ; do
esac
done
if test $show_version = yes; then
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
$AC_MACRODIR/acgeneral.m4`
echo "Autoconf version $version"
exit 0
fi
case $# in
0) infile=configure.in ;;
1) infile="$1" ;;

24
bin/autoheader.in
View File

@ -1,6 +1,6 @@
#! @SHELL@
# autoheader -- create `config.h.in' from `configure.in'
# Copyright (C) 1992, 1993, 1994, 1996, 1998, 1999 Free Software Foundation, Inc.
# Copyright (C) 1992-1994, 1996, 1998-1999 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -39,6 +39,14 @@ given.
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoheader (GNU @PACKAGE@) @VERSION@
Written by Roland McGrath.
Copyright (C) 1992-1994, 1996, 1998-1999 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."
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -67,7 +75,6 @@ esac
ac_LF_and_DOT="`echo; echo .`"
localdir=.
show_version=no
debug=0
# Basename for temporary files.
ah_base=autoh$$
@ -75,7 +82,7 @@ ah_base=autoh$$
while test $# -gt 0 ; do
case "${1}" in
-h | --help | --h* )
echo "${usage}"; exit 0 ;;
echo "$usage"; exit 0 ;;
-d | --debug | --d* )
debug=1; shift ;;
--localdir=* | --l*=* )
@ -95,7 +102,7 @@ while test $# -gt 0 ; do
AC_MACRODIR="${1}"
shift ;;
--version | --v* )
show_version=yes; shift ;;
echo "$version"; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@ -107,13 +114,6 @@ while test $# -gt 0 ; do
esac
done
if test $show_version = yes; then
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
$AC_MACRODIR/acgeneral.m4`
echo "Autoconf version $version"
exit 0
fi
acconfigs="${AC_MACRODIR}/acconfig.h"
test -r $localdir/acconfig.h && acconfigs="${acconfigs} $localdir/acconfig.h"
@ -177,7 +177,7 @@ undefined) echo "error: AC_CONFIG_HEADER not found in $infile" >&2; exit 1 ;;
esac
tmpout=$ah_base.out
if test $debug -eq 0; then trap "rm -f $ah_base*; exit 1" 1 2 15; fi
if test $debug -eq 0; then trap "rm -f $ah_base*; exit 1" 1 2 15; fi
# Don't write "do not edit" -- it will get copied into the
# config.h, which it's ok to edit.
cat <<EOF >$tmpout

20
bin/autoreconf.in
View File

@ -1,6 +1,6 @@
#! @SHELL@
# autoreconf - remake all Autoconf configure scripts in a directory tree
# Copyright (C) 1994 Free Software Foundation, Inc.
# Copyright (C) 1994, 1999 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -44,9 +44,16 @@ The following options are passed to \`automake':
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoreconf (GNU @PACKAGE@) @VERSION@
Written by David J. MacKenzie.
Copyright (C) 1994, 1999 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."
localdir=
verbose=:
show_version=no
force=no
automake_mode=--gnu
automake_deps=
@ -78,7 +85,7 @@ while test $# -gt 0; do
-f | --force)
force=yes; shift ;;
--version | --vers*)
show_version=yes; shift ;;
echo "$version"; exit 0 ;;
--cygnus | --foreign | --gnits | --gnu)
automake_mode=$1; shift ;;
--include-deps | -i)
@ -90,13 +97,6 @@ while test $# -gt 0; do
esac
done
if test $show_version = yes; then
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
$AC_MACRODIR/acgeneral.m4`
echo "Autoconf version $version"
exit 0
fi
if test $# -ne 0; then
echo "$usage" 1>&2; exit 1
fi

30
bin/autoscan.in
View File

@ -53,6 +53,15 @@ is a preliminary `configure.in' for that package.
--version print version number, then exit
Report bugs to <bug-autoconf@gnu.org>.
EOD
local ($version) = <<'EOD';
autoscan (GNU @PACKAGE@) @VERSION@
Written by David J. MacKenzie.
Copyright (C) 1994, 1999 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."
EOD
foreach $_ (@ARGV) {
@ -64,7 +73,8 @@ EOD
} elsif (/^--verb/) {
$verbose = 1;
} elsif (/^--vers/) {
&version;
print "$version";
exit 0;
} elsif (/^[^-]/) {
die "$usage" if defined($srcdir);
# Top level directory of the package being autoscanned.
@ -83,20 +93,6 @@ EOD
die "$0: cannot create configure.scan: $!\n";
}
# Print the version number and exit.
sub version
{
open(ACG, "<$datadir/acgeneral.m4") ||
die "$0: cannot open $datadir/acgeneral.m4: $!\n";
while (<ACG>) {
if (/define.AC_ACVERSION.\s*([0-9.]+)/) {
print "Autoconf version $1\n";
exit 0;
}
}
die "Autoconf version unknown\n";
}
# Put values in the tables of what to do with each token.
sub init_tables
{
@ -373,7 +369,7 @@ sub output_headers
if (defined($headers_macros{$word}) &&
$headers_macros{$word} eq 'AC_CHECK_HEADERS') {
push(@have_headers, $word);
} else {
} else {
&print_unique($headers_macros{$word});
}
}
@ -400,7 +396,7 @@ sub output_functions
if (defined($functions_macros{$word}) &&
$functions_macros{$word} eq 'AC_CHECK_FUNCS') {
push(@have_funcs, $word);
} else {
} else {
&print_unique($functions_macros{$word});
}
}

21
bin/ifnames.in
View File

@ -1,6 +1,6 @@
#! @SHELL@
# ifnames - print the identifiers used in C preprocessor conditionals
# Copyright (C) 1994, 1995 Free Software Foundation, Inc.
# Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -39,12 +39,18 @@ space-separated list of the files in which that identifier occurs.
Report bugs to <bug-autoconf@gnu.org>."
show_version=no
version="\
ifnames (GNU @PACKAGE@) @VERSION@
Written by David J. MacKenzie and Paul Eggert.
Copyright (C) 1994, 1995, 1999 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."
: ${AC_MACRODIR=@datadir@}
while test $# -gt 0; do
case "$1" in
case "$1" in
-h | --help | --h* )
echo "$usage"; exit 0 ;;
--macrodir=* | --m*=* )
@ -56,7 +62,7 @@ while test $# -gt 0; do
AC_MACRODIR="$1"
shift ;;
--version | --versio | --versi | --vers)
show_version=yes; shift ;;
echo "$version"; exit 0 ;;
--) # Stop option processing.
shift; break ;;
-*) echo "$usage" 1>&2; exit 1 ;;
@ -64,13 +70,6 @@ while test $# -gt 0; do
esac
done
if test $show_version = yes; then
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
$AC_MACRODIR/acgeneral.m4`
echo "Autoconf version $version"
exit 0
fi
@AWK@ '
# Record that sym was found in FILENAME.
function file_sym(sym, i, fs) {

6
doc/Makefile.am
View File

@ -77,8 +77,10 @@ install-data-hook: INSTALL.txt
editsh = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e \
's,@''M4''@,$(M4),g' -e 's,@''AWK''@,$(AWK),g' \
-e 's,@''SHELL''@,$(SHELL),g'
editpl = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e 's,@''PERL''@,$(PERL),g'
-e 's,@''SHELL''@,$(SHELL),g' \
-e 's,@''VERSION''@,$(VERSION),g' -e 's,@''PACKAGE''@,$(PACKAGE),g'
editpl = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e 's,@''PERL''@,$(PERL),g' \
-e 's,@''VERSION''@,$(VERSION),g' -e 's,@''PACKAGE''@,$(PACKAGE),g'
.sh:
rm -f $@ $@.tmp

21
ifnames.in
View File

@ -1,6 +1,6 @@
#! @SHELL@
# ifnames - print the identifiers used in C preprocessor conditionals
# Copyright (C) 1994, 1995 Free Software Foundation, Inc.
# Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -39,12 +39,18 @@ space-separated list of the files in which that identifier occurs.
Report bugs to <bug-autoconf@gnu.org>."
show_version=no
version="\
ifnames (GNU @PACKAGE@) @VERSION@
Written by David J. MacKenzie and Paul Eggert.
Copyright (C) 1994, 1995, 1999 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."
: ${AC_MACRODIR=@datadir@}
while test $# -gt 0; do
case "$1" in
case "$1" in
-h | --help | --h* )
echo "$usage"; exit 0 ;;
--macrodir=* | --m*=* )
@ -56,7 +62,7 @@ while test $# -gt 0; do
AC_MACRODIR="$1"
shift ;;
--version | --versio | --versi | --vers)
show_version=yes; shift ;;
echo "$version"; exit 0 ;;
--) # Stop option processing.
shift; break ;;
-*) echo "$usage" 1>&2; exit 1 ;;
@ -64,13 +70,6 @@ while test $# -gt 0; do
esac
done
if test $show_version = yes; then
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
$AC_MACRODIR/acgeneral.m4`
echo "Autoconf version $version"
exit 0
fi
@AWK@ '
# Record that sym was found in FILENAME.
function file_sym(sym, i, fs) {

21
ifnames.sh
View File

@ -1,6 +1,6 @@
#! @SHELL@
# ifnames - print the identifiers used in C preprocessor conditionals
# Copyright (C) 1994, 1995 Free Software Foundation, Inc.
# Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -39,12 +39,18 @@ space-separated list of the files in which that identifier occurs.
Report bugs to <bug-autoconf@gnu.org>."
show_version=no
version="\
ifnames (GNU @PACKAGE@) @VERSION@
Written by David J. MacKenzie and Paul Eggert.
Copyright (C) 1994, 1995, 1999 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."
: ${AC_MACRODIR=@datadir@}
while test $# -gt 0; do
case "$1" in
case "$1" in
-h | --help | --h* )
echo "$usage"; exit 0 ;;
--macrodir=* | --m*=* )
@ -56,7 +62,7 @@ while test $# -gt 0; do
AC_MACRODIR="$1"
shift ;;
--version | --versio | --versi | --vers)
show_version=yes; shift ;;
echo "$version"; exit 0 ;;
--) # Stop option processing.
shift; break ;;
-*) echo "$usage" 1>&2; exit 1 ;;
@ -64,13 +70,6 @@ while test $# -gt 0; do
esac
done
if test $show_version = yes; then
version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
$AC_MACRODIR/acgeneral.m4`
echo "Autoconf version $version"
exit 0
fi
@AWK@ '
# Record that sym was found in FILENAME.
function file_sym(sym, i, fs) {