* Makefile.am (editpl, editsh): Merge into...

(edit).
* m4sh.m4 (AS_UNAME): Eved out from...
* acgeneral.m4 (_AC_INIT_DEFAULTS): here.
(_AC_INIT_PACKAGE): Define AC_PACKAGE_NAME.
(_AC_INIT_PARSE_ARGS): AC_SUBST the PACKAGE_ variables.
Propagate their use in the executables and the test suite.
* tests/atgeneral.m4 (PATH): Include only absolute paths.
(AT_INIT): Use AS_UNAME.
This commit is contained in:
Akim Demaille 2001-01-16 10:25:57 +00:00
parent 3becb30f56
commit e2e36c55ce
35 changed files with 401 additions and 268 deletions

View File

@ -1,3 +1,15 @@
2001-01-16 Akim Demaille <akim@epita.fr>
* Makefile.am (editpl, editsh): Merge into...
(edit).
* m4sh.m4 (AS_UNAME): Eved out from...
* acgeneral.m4 (_AC_INIT_DEFAULTS): here.
(_AC_INIT_PACKAGE): Define AC_PACKAGE_NAME.
(_AC_INIT_PARSE_ARGS): AC_SUBST the PACKAGE_ variables.
Propagate their use in the executables and the test suite.
* tests/atgeneral.m4 (PATH): Include only absolute paths.
(AT_INIT): Use AS_UNAME.
2001-01-16 Akim Demaille <akim@epita.fr>
When default headers are used, check for their presence.

View File

@ -30,6 +30,10 @@ WGET = wget
bin_SCRIPTS = autoconf autoheader autoreconf autoupdate ifnames @PERLSCRIPTS@
EXTRA_SCRIPTS = autoscan
# FIXME: Current Automakes are blind and cannot see inner AC_SUBST,
# so help it.
PACKAGE_NAME = @PACKAGE_NAME@
# FIXME:
# s/distpackageDATA/dist_pkgdata_DATA/
# s/nodistpackageDATA/nodist_pkgdata_DATA/
@ -112,22 +116,17 @@ install-data-hook: INSTALL.txt
## The scripts. ##
## ------------- ##
editsh = sed \
-e 's,@datadir\@,$(pkgdatadir),g' \
-e 's,@M4\@,$(M4),g' \
-e 's,@AWK\@,$(AWK),g' \
edit = sed \
-e 's,@SHELL\@,$(SHELL),g' \
-e 's,@VERSION\@,$(VERSION),g' \
-e 's,@PACKAGE\@,$(PACKAGE),g' \
-e 's,@PERL\@,$(PERL),g' \
-e 's,@datadir\@,$(pkgdatadir),g' \
-e 's,@bindir\@,$(bindir),g' \
-e 's,@autoconf-name\@,'`echo autoconf | sed '$(transform)'`',g' \
-e 's,@autoheader-name\@,'`echo autoheader | sed '$(transform)'`',g'
editpl = sed \
-e 's,@datadir\@,$(pkgdatadir),g' \
-e 's,@PERL\@,$(PERL),g' \
-e 's,@autoheader-name\@,'`echo autoheader | sed '$(transform)'`',g' \
-e 's,@M4\@,$(M4),g' \
-e 's,@AWK\@,$(AWK),g' \
-e 's,@VERSION\@,$(VERSION),g' \
-e 's,@PACKAGE\@,$(PACKAGE),g'
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g'
## All the scripts below depend on configure.in so that they are rebuilt
## when the Autoconf version changes. Unfortunately, suffix rules cannot
@ -136,37 +135,37 @@ editpl = sed \
autoconf: $(srcdir)/autoconf.sh $(srcdir)/configure.in
rm -f autoconf autoconf.tmp
$(editsh) $(srcdir)/autoconf.sh >autoconf.tmp
$(edit) $(srcdir)/autoconf.sh >autoconf.tmp
chmod +x autoconf.tmp
mv autoconf.tmp autoconf
autoheader: $(srcdir)/autoheader.sh $(srcdir)/configure.in
rm -f autoheader autoheader.tmp
$(editsh) $(srcdir)/autoheader.sh >autoheader.tmp
$(edit) $(srcdir)/autoheader.sh >autoheader.tmp
chmod +x autoheader.tmp
mv autoheader.tmp autoheader
autoreconf: $(srcdir)/autoreconf.sh $(srcdir)/configure.in
rm -f autoreconf autoreconf.tmp
$(editsh) $(srcdir)/autoreconf.sh >autoreconf.tmp
$(edit) $(srcdir)/autoreconf.sh >autoreconf.tmp
chmod +x autoreconf.tmp
mv autoreconf.tmp autoreconf
autoupdate: $(srcdir)/autoupdate.sh $(srcdir)/configure.in
rm -f autoupdate autoupdate.tmp
$(editsh) $(srcdir)/autoupdate.sh >autoupdate.tmp
$(edit) $(srcdir)/autoupdate.sh >autoupdate.tmp
chmod +x autoupdate.tmp
mv autoupdate.tmp autoupdate
ifnames: $(srcdir)/ifnames.sh $(srcdir)/configure.in
rm -f ifnames ifnames.tmp
$(editsh) $(srcdir)/ifnames.sh >ifnames.tmp
$(edit) $(srcdir)/ifnames.sh >ifnames.tmp
chmod +x ifnames.tmp
mv ifnames.tmp ifnames
autoscan: $(srcdir)/autoscan.pl $(srcdir)/configure.in
rm -f autoscan autoscan.tmp
$(editpl) $(srcdir)/autoscan.pl >autoscan.tmp
$(edit) $(srcdir)/autoscan.pl >autoscan.tmp
chmod +x autoscan.tmp
mv autoscan.tmp autoscan

View File

@ -76,6 +76,10 @@ WGET = wget
bin_SCRIPTS = autoconf autoheader autoreconf autoupdate ifnames @PERLSCRIPTS@
EXTRA_SCRIPTS = autoscan
# FIXME: Current Automakes are blind and cannot see inner AC_SUBST,
# so help it.
PACKAGE_NAME = @PACKAGE_NAME@
# FIXME:
# s/distpackageDATA/dist_pkgdata_DATA/
# s/nodistpackageDATA/nodist_pkgdata_DATA/
@ -101,21 +105,18 @@ CLEANFILES = autoconf.m4f $(bin_SCRIPTS)
MAINTAINERCLEANFILES = acversion.m4 INSTALL.txt
editsh = sed -e 's,@datadir\@,$(pkgdatadir),g' -e 's,@M4\@,$(M4),g' -e 's,@AWK\@,$(AWK),g' -e 's,@SHELL\@,$(SHELL),g' -e 's,@VERSION\@,$(VERSION),g' -e 's,@PACKAGE\@,$(PACKAGE),g' -e 's,@bindir\@,$(bindir),g' -e 's,@autoconf-name\@,'`echo autoconf | sed '$(transform)'`',g' -e 's,@autoheader-name\@,'`echo autoheader | sed '$(transform)'`',g'
editpl = sed -e 's,@datadir\@,$(pkgdatadir),g' -e 's,@PERL\@,$(PERL),g' -e 's,@VERSION\@,$(VERSION),g' -e 's,@PACKAGE\@,$(PACKAGE),g'
edit = sed -e 's,@SHELL\@,$(SHELL),g' -e 's,@PERL\@,$(PERL),g' -e 's,@datadir\@,$(pkgdatadir),g' -e 's,@bindir\@,$(bindir),g' -e 's,@autoconf-name\@,'`echo autoconf | sed '$(transform)'`',g' -e 's,@autoheader-name\@,'`echo autoheader | sed '$(transform)'`',g' -e 's,@M4\@,$(M4),g' -e 's,@AWK\@,$(AWK),g' -e 's,@VERSION\@,$(VERSION),g' -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g'
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_FILES =
SCRIPTS = $(bin_SCRIPTS)
DATA = $(pkgdata_DATA)
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS README-alpha THANKS TODO aclocal.m4 config.guess \
config.sub configure configure.in install-sh missing \
config.sub configure configure.in install-sh ltconfig ltmain.sh missing \
mkinstalldirs
@ -129,7 +130,7 @@ GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
.SUFFIXES: .m4 .m4f
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@ -445,37 +446,37 @@ install-data-hook: INSTALL.txt
autoconf: $(srcdir)/autoconf.sh $(srcdir)/configure.in
rm -f autoconf autoconf.tmp
$(editsh) $(srcdir)/autoconf.sh >autoconf.tmp
$(edit) $(srcdir)/autoconf.sh >autoconf.tmp
chmod +x autoconf.tmp
mv autoconf.tmp autoconf
autoheader: $(srcdir)/autoheader.sh $(srcdir)/configure.in
rm -f autoheader autoheader.tmp
$(editsh) $(srcdir)/autoheader.sh >autoheader.tmp
$(edit) $(srcdir)/autoheader.sh >autoheader.tmp
chmod +x autoheader.tmp
mv autoheader.tmp autoheader
autoreconf: $(srcdir)/autoreconf.sh $(srcdir)/configure.in
rm -f autoreconf autoreconf.tmp
$(editsh) $(srcdir)/autoreconf.sh >autoreconf.tmp
$(edit) $(srcdir)/autoreconf.sh >autoreconf.tmp
chmod +x autoreconf.tmp
mv autoreconf.tmp autoreconf
autoupdate: $(srcdir)/autoupdate.sh $(srcdir)/configure.in
rm -f autoupdate autoupdate.tmp
$(editsh) $(srcdir)/autoupdate.sh >autoupdate.tmp
$(edit) $(srcdir)/autoupdate.sh >autoupdate.tmp
chmod +x autoupdate.tmp
mv autoupdate.tmp autoupdate
ifnames: $(srcdir)/ifnames.sh $(srcdir)/configure.in
rm -f ifnames ifnames.tmp
$(editsh) $(srcdir)/ifnames.sh >ifnames.tmp
$(edit) $(srcdir)/ifnames.sh >ifnames.tmp
chmod +x ifnames.tmp
mv ifnames.tmp ifnames
autoscan: $(srcdir)/autoscan.pl $(srcdir)/configure.in
rm -f autoscan autoscan.tmp
$(editpl) $(srcdir)/autoscan.pl >autoscan.tmp
$(edit) $(srcdir)/autoscan.pl >autoscan.tmp
chmod +x autoscan.tmp
mv autoscan.tmp autoscan

View File

@ -582,10 +582,14 @@ m4_popdef([AC_Prefix])dnl
# _AC_INIT_PACKAGE(PACKAGE, VERSION, [BUG-REPORT])
# ------------------------------------------------
# _AC_INIT_PACKAGE(PACKAGE-NAME, VERSION,
# [BUG-REPORT],
# [TAR-NAME = unGNU'd lower case PACKAGE-NAME])
# --------------------------------------------------------------
m4_define([_AC_INIT_PACKAGE],
[m4_define([AC_PACKAGE_NAME], [$1])
m4_define([AC_PACKAGE_TARNAME],
m4_tolower(m4_patsubst([[[$1]]], [GNU ])))
m4_define([AC_PACKAGE_VERSION], [$2])
m4_define([AC_PACKAGE_STRING], [$1 $2])
m4_define([AC_PACKAGE_BUGREPORT], [$3])
@ -739,7 +743,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
# Name of the executable.
as_me=`echo "$[0]" | sed 's,.*/,,'`
cat >config.log << EOF
cat >config.log <<EOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
@ -747,30 +751,10 @@ It was created by $as_me m4_ifset([AC_PACKAGE_STRING],
[(AC_PACKAGE_STRING) ])AC_ACVERSION, executed with
> $[0] $[@]
EOF
AS_UNAME >>config.log
## ---------- ##
## Platform. ##
## ---------- ##
hostname = $ac_hostname
uname -m = `(uname -m) 2>/dev/null || echo unknown`
uname -r = `(uname -r) 2>/dev/null || echo unknown`
uname -s = `(uname -s) 2>/dev/null || echo unknown`
uname -v = `(uname -v) 2>/dev/null || echo unknown`
/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
/bin/arch = `(/bin/arch) 2>/dev/null`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
hostinfo = `(hostinfo) 2>/dev/null`
/bin/machine = `(/bin/machine) 2>/dev/null`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
/bin/universe = `(/bin/universe) 2>/dev/null`
PATH = $PATH
cat >>config.log <<EOF
## ------------ ##
## Core tests. ##
## ------------ ##
@ -886,23 +870,36 @@ srcdir=
verbose=
x_includes=NONE
x_libraries=NONE
dnl Installation directory options.
dnl These are left unexpanded so users can "make install exec_prefix=/foo"
dnl and all the variables that are supposed to be based on exec_prefix
dnl by default will actually change.
dnl Use braces instead of parens because sh, perl, etc. also accept them.
AC_SUBST(bindir, '${exec_prefix}/bin')dnl
AC_SUBST(sbindir, '${exec_prefix}/sbin')dnl
AC_SUBST(libexecdir, '${exec_prefix}/libexec')dnl
AC_SUBST(datadir, '${prefix}/share')dnl
AC_SUBST(sysconfdir, '${prefix}/etc')dnl
AC_SUBST(sharedstatedir, '${prefix}/com')dnl
AC_SUBST(localstatedir, '${prefix}/var')dnl
AC_SUBST(libdir, '${exec_prefix}/lib')dnl
AC_SUBST(includedir, '${prefix}/include')dnl
AC_SUBST(oldincludedir, '/usr/include')dnl
AC_SUBST(infodir, '${prefix}/info')dnl
AC_SUBST(mandir, '${prefix}/man')dnl
# Installation directory options.
# These are left unexpanded so users can "make install exec_prefix=/foo"
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
AC_SUBST([bindir], ['${exec_prefix}/bin'])dnl
AC_SUBST([sbindir], ['${exec_prefix}/sbin'])dnl
AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])dnl
AC_SUBST([datadir], ['${prefix}/share'])dnl
AC_SUBST([sysconfdir], ['${prefix}/etc'])dnl
AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl
AC_SUBST([localstatedir], ['${prefix}/var'])dnl
AC_SUBST([libdir], ['${exec_prefix}/lib'])dnl
AC_SUBST([includedir], ['${prefix}/include'])dnl
AC_SUBST([oldincludedir], ['/usr/include'])dnl
AC_SUBST([infodir], ['${prefix}/info'])dnl
AC_SUBST([mandir], ['${prefix}/man'])dnl
# Identity of this package.
AC_SUBST([PACKAGE_NAME],
[m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])])dnl
AC_SUBST([PACKAGE_TARNAME],
[m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])])dnl
AC_SUBST([PACKAGE_VERSION],
[m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])])dnl
AC_SUBST([PACKAGE_STRING],
[m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])])dnl
AC_SUBST([PACKAGE_BUGREPORT],
[m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])dnl
ac_prev=
for ac_option

View File

@ -60,7 +60,7 @@ In tracing mode, no configuration script is created.
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoconf (GNU @PACKAGE@) @VERSION@
autoconf (@PACKAGE_NAME@) @VERSION@
Written by David J. MacKenzie.
Copyright 1992, 1993, 1994, 1996, 1999, 2000

View File

@ -60,7 +60,7 @@ In tracing mode, no configuration script is created.
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoconf (GNU @PACKAGE@) @VERSION@
autoconf (@PACKAGE_NAME@) @VERSION@
Written by David J. MacKenzie.
Copyright 1992, 1993, 1994, 1996, 1999, 2000

View File

@ -49,7 +49,7 @@ Library directories:
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoheader (GNU @PACKAGE@) @VERSION@
autoheader (@PACKAGE_NAME@) @VERSION@
Written by Roland McGrath.
Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000

View File

@ -49,7 +49,7 @@ Library directories:
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoheader (GNU @PACKAGE@) @VERSION@
autoheader (@PACKAGE_NAME@) @VERSION@
Written by Roland McGrath.
Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000

View File

@ -63,7 +63,7 @@ are honored.
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoreconf (GNU @PACKAGE@) @VERSION@
autoreconf (@PACKAGE_NAME@) @VERSION@
Written by David J. MacKenzie.
Copyright 1994, 1999, 2000 Free Software Foundation, Inc.

View File

@ -63,7 +63,7 @@ are honored.
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoreconf (GNU @PACKAGE@) @VERSION@
autoreconf (@PACKAGE_NAME@) @VERSION@
Written by David J. MacKenzie.
Copyright 1994, 1999, 2000 Free Software Foundation, Inc.

View File

@ -64,7 +64,7 @@ Report bugs to <bug-autoconf\@gnu.org>.\n";
# Display version (--version).
sub print_version
{
print "autoscan (GNU @PACKAGE@) @VERSION@
print "autoscan (@PACKAGE_NAME@) @VERSION@
Written by David J. MacKenzie.
Copyright 1994, 1999, 2000 Free Software Foundation, Inc.

View File

@ -64,7 +64,7 @@ Report bugs to <bug-autoconf\@gnu.org>.\n";
# Display version (--version).
sub print_version
{
print "autoscan (GNU @PACKAGE@) @VERSION@
print "autoscan (@PACKAGE_NAME@) @VERSION@
Written by David J. MacKenzie.
Copyright 1994, 1999, 2000 Free Software Foundation, Inc.

View File

@ -60,7 +60,7 @@ In tracing mode, no configuration script is created.
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoconf (GNU @PACKAGE@) @VERSION@
autoconf (@PACKAGE_NAME@) @VERSION@
Written by David J. MacKenzie.
Copyright 1992, 1993, 1994, 1996, 1999, 2000

View File

@ -49,7 +49,7 @@ Library directories:
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoheader (GNU @PACKAGE@) @VERSION@
autoheader (@PACKAGE_NAME@) @VERSION@
Written by Roland McGrath.
Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000

View File

@ -63,7 +63,7 @@ are honored.
Report bugs to <bug-autoconf@gnu.org>."
version="\
autoreconf (GNU @PACKAGE@) @VERSION@
autoreconf (@PACKAGE_NAME@) @VERSION@
Written by David J. MacKenzie.
Copyright 1994, 1999, 2000 Free Software Foundation, Inc.

View File

@ -64,7 +64,7 @@ Report bugs to <bug-autoconf\@gnu.org>.\n";
# Display version (--version).
sub print_version
{
print "autoscan (GNU @PACKAGE@) @VERSION@
print "autoscan (@PACKAGE_NAME@) @VERSION@
Written by David J. MacKenzie.
Copyright 1994, 1999, 2000 Free Software Foundation, Inc.

View File

@ -40,7 +40,7 @@ space-separated list of the files in which that identifier occurs.
Report bugs to <bug-autoconf@gnu.org>."
version="\
ifnames (GNU @PACKAGE@) @VERSION@
ifnames (@PACKAGE_NAME@) @VERSION@
Written by David J. MacKenzie and Paul Eggert.
Copyright 1994, 1995, 1999, 2000 Free Software Foundation, Inc.

220
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.49c for Autoconf 2.49c.
# Generated by Autoconf 2.49c for GNU Autoconf 2.49c.
#
# Report bugs to <bug-autoconf@gnu.org>.
#
@ -56,36 +56,43 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
# Name of the executable.
as_me=`echo "$0" | sed 's,.*/,,'`
cat >config.log << EOF
cat >config.log <<EOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me (Autoconf 2.49c) 2.49c, executed with
It was created by $as_me (GNU Autoconf 2.49c) 2.49c, executed with
> $0 $@
EOF
{
cat <<_ASUNAME
## ---------- ##
## Platform. ##
## ---------- ##
hostname = $ac_hostname
hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
uname -m = `(uname -m) 2>/dev/null || echo unknown`
uname -r = `(uname -r) 2>/dev/null || echo unknown`
uname -s = `(uname -s) 2>/dev/null || echo unknown`
uname -v = `(uname -v) 2>/dev/null || echo unknown`
/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
/bin/arch = `(/bin/arch) 2>/dev/null`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
hostinfo = `(hostinfo) 2>/dev/null`
/bin/machine = `(/bin/machine) 2>/dev/null`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
/bin/universe = `(/bin/universe) 2>/dev/null`
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
PATH = $PATH
_ASUNAME
} >>config.log
cat >>config.log <<EOF
## ------------ ##
## Core tests. ##
## ------------ ##
@ -131,6 +138,13 @@ ac_cr_alnum=$ac_cr_az$ac_cr_AZ$ac_cr_09
ac_tr_sh="sed y%*+%pp%;s%[^_$ac_cr_alnum]%_%g"
ac_tr_cpp="sed y%*$ac_cr_az%P$ac_cr_AZ%;s%[^_$ac_cr_alnum]%_%g"
# By default always use an empty string as the executable extension.
# Only change it if the script calls AC_EXEEXT.
ac_exeext=
# By default assume that objects files use an extension of .o. Only
# change it if the script calls AC_OBJEXT.
ac_objext=o
ac_unique_file="acgeneral.m4"
# Initialize some variables set by options.
@ -152,6 +166,12 @@ srcdir=
verbose=
x_includes=NONE
x_libraries=NONE
# Installation directory options.
# These are left unexpanded so users can "make install exec_prefix=/foo"
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
@ -165,6 +185,13 @@ oldincludedir='/usr/include'
infodir='${prefix}/info'
mandir='${prefix}/man'
# Identity of this package.
PACKAGE_NAME='GNU Autoconf'
PACKAGE_TARNAME='autoconf'
PACKAGE_VERSION='2.49c'
PACKAGE_STRING='GNU Autoconf 2.49c'
PACKAGE_BUGREPORT='bug-autoconf@gnu.org'
ac_prev=
for ac_option
do
@ -211,7 +238,7 @@ do
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
{ { echo "$as_me:214: error: invalid feature name: $ac_feature" >&5
{ { echo "$as_me:241: error: invalid feature name: $ac_feature" >&5
echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
{ (exit 1); exit; }; }
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@ -221,7 +248,7 @@ echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
{ { echo "$as_me:224: error: invalid feature name: $ac_feature" >&5
{ { echo "$as_me:251: error: invalid feature name: $ac_feature" >&5
echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
{ (exit 1); exit; }; }
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@ -404,7 +431,7 @@ echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
{ { echo "$as_me:407: error: invalid package name: $ac_package" >&5
{ { echo "$as_me:434: error: invalid package name: $ac_package" >&5
echo "$as_me: error: invalid package name: $ac_package" >&2;}
{ (exit 1); exit; }; }
ac_package=`echo $ac_package| sed 's/-/_/g'`
@ -418,7 +445,7 @@ echo "$as_me: error: invalid package name: $ac_package" >&2;}
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
{ { echo "$as_me:421: error: invalid package name: $ac_package" >&5
{ { echo "$as_me:448: error: invalid package name: $ac_package" >&5
echo "$as_me: error: invalid package name: $ac_package" >&2;}
{ (exit 1); exit; }; }
ac_package=`echo $ac_package | sed 's/-/_/g'`
@ -442,7 +469,7 @@ echo "$as_me: error: invalid package name: $ac_package" >&2;}
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
-*) { { echo "$as_me:445: error: unrecognized option: $ac_option
-*) { { echo "$as_me:472: error: unrecognized option: $ac_option
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $ac_option
Try \`$0 --help' for more information." >&2;}
@ -453,7 +480,7 @@ Try \`$0 --help' for more information." >&2;}
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null &&
{ { echo "$as_me:456: error: invalid variable name: $ac_envvar" >&5
{ { echo "$as_me:483: error: invalid variable name: $ac_envvar" >&5
echo "$as_me: error: invalid variable name: $ac_envvar" >&2;}
{ (exit 1); exit; }; }
ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
@ -462,10 +489,10 @@ echo "$as_me: error: invalid variable name: $ac_envvar" >&2;}
*)
# FIXME: should be removed in autoconf 3.0.
{ echo "$as_me:465: WARNING: you should use --build, --host, --target" >&5
{ echo "$as_me:492: WARNING: you should use --build, --host, --target" >&5
echo "$as_me: WARNING: you should use --build, --host, --target" >&2;}
expr "x$ac_option" : ".*[^-._$ac_cr_alnum]" >/dev/null &&
{ echo "$as_me:468: WARNING: invalid host type: $ac_option" >&5
{ echo "$as_me:495: WARNING: invalid host type: $ac_option" >&5
echo "$as_me: WARNING: invalid host type: $ac_option" >&2;}
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
@ -475,7 +502,7 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
{ { echo "$as_me:478: error: missing argument to $ac_option" >&5
{ { echo "$as_me:505: error: missing argument to $ac_option" >&5
echo "$as_me: error: missing argument to $ac_option" >&2;}
{ (exit 1); exit; }; }
fi
@ -489,7 +516,7 @@ do
case $ac_val in
[\\/$]* | ?:[\\/]* ) ;;
NONE ) ;;
*) { { echo "$as_me:492: error: expected an absolute path for --$ac_var: $ac_val" >&5
*) { { echo "$as_me:519: error: expected an absolute path for --$ac_var: $ac_val" >&5
echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;}
{ (exit 1); exit; }; };;
esac
@ -505,7 +532,7 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
{ echo "$as_me:508: WARNING: If you wanted to set the --build type, don't use --host.
{ echo "$as_me:535: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&5
echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&2;}
@ -533,11 +560,11 @@ else
fi
if test ! -r $srcdir/$ac_unique_file; then
if test "$ac_srcdir_defaulted" = yes; then
{ { echo "$as_me:536: error: cannot find sources in $ac_confdir or .." >&5
{ { echo "$as_me:563: error: cannot find sources in $ac_confdir or .." >&5
echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2;}
{ (exit 1); exit; }; }
else
{ { echo "$as_me:540: error: cannot find sources in $srcdir" >&5
{ { echo "$as_me:567: error: cannot find sources in $srcdir" >&5
echo "$as_me: error: cannot find sources in $srcdir" >&2;}
{ (exit 1); exit; }; }
fi
@ -563,7 +590,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<EOF
\`configure' configures Autoconf 2.49c to adapt to many kinds of systems.
\`configure' configures GNU Autoconf 2.49c to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -625,7 +652,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Autoconf 2.49c:";;
short | recursive ) echo "Configuration of GNU Autoconf 2.49c:";;
esac
cat <<\EOF
@ -663,7 +690,7 @@ if test "$ac_init_help" = "recursive"; then
echo
$ac_configure --help
else
{ echo "$as_me:666: WARNING: no configuration information is in $ac_subdir" >&5
{ echo "$as_me:693: WARNING: no configuration information is in $ac_subdir" >&5
echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;}
fi
cd $ac_popdir
@ -673,7 +700,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\EOF
configure (Autoconf 2.49c) 2.49c
configure (GNU Autoconf 2.49c) 2.49c
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
Free Software Foundation, Inc.
@ -744,7 +771,7 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
{ echo "$as_me:747: loading cache $cache_file" >&5
{ echo "$as_me:774: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;;
@ -752,7 +779,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
esac
fi
else
{ echo "$as_me:755: creating cache $cache_file" >&5
{ echo "$as_me:782: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@ -768,30 +795,30 @@ for ac_var in `(set) 2>&1 |
eval ac_new_val="\$ac_env_${ac_var}_value"
case $ac_old_set,$ac_new_set in
set,)
{ echo "$as_me:771: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
{ echo "$as_me:798: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_suggest_removing_cache=: ;;
,set)
{ echo "$as_me:775: WARNING: \`$ac_var' was not set in the previous run" >&5
{ echo "$as_me:802: WARNING: \`$ac_var' was not set in the previous run" >&5
echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;}
ac_suggest_removing_cache=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
{ echo "$as_me:781: WARNING: \`$ac_var' has changed since the previous run:" >&5
{ echo "$as_me:808: WARNING: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;}
{ echo "$as_me:783: WARNING: former value: $ac_old_val" >&5
{ echo "$as_me:810: WARNING: former value: $ac_old_val" >&5
echo "$as_me: WARNING: former value: $ac_old_val" >&2;}
{ echo "$as_me:785: WARNING: current value: $ac_new_val" >&5
{ echo "$as_me:812: WARNING: current value: $ac_new_val" >&5
echo "$as_me: WARNING: current value: $ac_new_val" >&2;}
ac_suggest_removing_cache=:
fi;;
esac
done
if $ac_suggest_removing_cache; then
{ echo "$as_me:792: WARNING: changes in the environment can compromise the build" >&5
{ echo "$as_me:819: WARNING: changes in the environment can compromise the build" >&5
echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;}
{ echo "$as_me:794: WARNING: consider removing $cache_file and starting over" >&5
{ echo "$as_me:821: WARNING: consider removing $cache_file and starting over" >&5
echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;}
fi
@ -825,7 +852,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
fi
done
if test -z "$ac_aux_dir"; then
{ { echo "$as_me:828: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
{ { echo "$as_me:855: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
{ (exit 1); exit; }; }
fi
@ -845,7 +872,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo "$as_me:848: checking for a BSD compatible install" >&5
echo "$as_me:875: checking for a BSD compatible install" >&5
echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
@ -894,7 +921,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
echo "$as_me:897: result: $INSTALL" >&5
echo "$as_me:924: result: $INSTALL" >&5
echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@ -905,7 +932,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo "$as_me:908: checking whether build environment is sane" >&5
echo "$as_me:935: checking whether build environment is sane" >&5
echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
# Just in case
sleep 1
@ -928,7 +955,7 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
{ { echo "$as_me:931: error: ls -t appears to fail. Make sure there is not a broken
{ { echo "$as_me:958: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&5
echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&2;}
@ -941,14 +968,14 @@ then
# Ok.
:
else
{ { echo "$as_me:944: error: newly created file is older than distributed files!
{ { echo "$as_me:971: error: newly created file is older than distributed files!
Check your system clock" >&5
echo "$as_me: error: newly created file is older than distributed files!
Check your system clock" >&2;}
{ (exit 1); exit; }; }
fi
rm -f conftest*
echo "$as_me:951: result: yes" >&5
echo "$as_me:978: result: yes" >&5
echo "${ECHO_T}yes" >&6
if test "$program_transform_name" = s,x,x,; then
program_transform_name=
@ -969,7 +996,7 @@ test "$program_suffix" != NONE &&
# sed with no file args requires a program.
test -z "$program_transform_name" && program_transform_name="s,x,x,"
echo "$as_me:972: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "$as_me:999: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@ -989,11 +1016,11 @@ fi
rm -f conftestmake
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
echo "$as_me:992: result: yes" >&5
echo "$as_me:1019: result: yes" >&5
echo "${ECHO_T}yes" >&6
SET_MAKE=
else
echo "$as_me:996: result: no" >&5
echo "$as_me:1023: result: no" >&5
echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
fi
@ -1003,7 +1030,7 @@ PACKAGE=autoconf
VERSION=2.49c
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ { echo "$as_me:1006: error: source directory already configured; run \"make distclean\" there first" >&5
{ { echo "$as_me:1033: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit; }; }
fi
@ -1017,78 +1044,78 @@ cat >>confdefs.h <<EOF
EOF
missing_dir=`cd $ac_aux_dir && pwd`
echo "$as_me:1020: checking for working aclocal" >&5
echo "$as_me:1047: checking for working aclocal" >&5
echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (aclocal --version) < /dev/null > /dev/null 2>&1; then
ACLOCAL=aclocal
echo "$as_me:1027: result: found" >&5
echo "$as_me:1054: result: found" >&5
echo "${ECHO_T}found" >&6
else
ACLOCAL="$SHELL $missing_dir/missing aclocal"
echo "$as_me:1031: result: missing" >&5
echo "$as_me:1058: result: missing" >&5
echo "${ECHO_T}missing" >&6
fi
echo "$as_me:1035: checking for working autoconf" >&5
echo "$as_me:1062: checking for working autoconf" >&5
echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (autoconf --version) < /dev/null > /dev/null 2>&1; then
AUTOCONF=autoconf
echo "$as_me:1042: result: found" >&5
echo "$as_me:1069: result: found" >&5
echo "${ECHO_T}found" >&6
else
AUTOCONF="$SHELL $missing_dir/missing autoconf"
echo "$as_me:1046: result: missing" >&5
echo "$as_me:1073: result: missing" >&5
echo "${ECHO_T}missing" >&6
fi
echo "$as_me:1050: checking for working automake" >&5
echo "$as_me:1077: checking for working automake" >&5
echo $ECHO_N "checking for working automake... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (automake --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake
echo "$as_me:1057: result: found" >&5
echo "$as_me:1084: result: found" >&5
echo "${ECHO_T}found" >&6
else
AUTOMAKE="$SHELL $missing_dir/missing automake"
echo "$as_me:1061: result: missing" >&5
echo "$as_me:1088: result: missing" >&5
echo "${ECHO_T}missing" >&6
fi
echo "$as_me:1065: checking for working autoheader" >&5
echo "$as_me:1092: checking for working autoheader" >&5
echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (autoheader --version) < /dev/null > /dev/null 2>&1; then
AUTOHEADER=autoheader
echo "$as_me:1072: result: found" >&5
echo "$as_me:1099: result: found" >&5
echo "${ECHO_T}found" >&6
else
AUTOHEADER="$SHELL $missing_dir/missing autoheader"
echo "$as_me:1076: result: missing" >&5
echo "$as_me:1103: result: missing" >&5
echo "${ECHO_T}missing" >&6
fi
echo "$as_me:1080: checking for working makeinfo" >&5
echo "$as_me:1107: checking for working makeinfo" >&5
echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
MAKEINFO=makeinfo
echo "$as_me:1087: result: found" >&5
echo "$as_me:1114: result: found" >&5
echo "${ECHO_T}found" >&6
else
MAKEINFO="$SHELL $missing_dir/missing makeinfo"
echo "$as_me:1091: result: missing" >&5
echo "$as_me:1118: result: missing" >&5
echo "${ECHO_T}missing" >&6
fi
@ -1097,7 +1124,7 @@ AUTOTEST_PATH=..
# Extract the first word of "expr", so it can be a program name with args.
set dummy expr; ac_word=$2
echo "$as_me:1100: checking for $ac_word" >&5
echo "$as_me:1127: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_EXPR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -1124,10 +1151,10 @@ fi
EXPR=$ac_cv_path_EXPR
if test -n "$EXPR"; then
echo "$as_me:1127: result: $EXPR" >&5
echo "$as_me:1154: result: $EXPR" >&5
echo "${ECHO_T}$EXPR" >&6
else
echo "$as_me:1130: result: no" >&5
echo "$as_me:1157: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@ -1139,7 +1166,7 @@ for ac_prog in gm4 gnum4 m4
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo "$as_me:1142: checking for $ac_word" >&5
echo "$as_me:1169: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_M4+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -1166,10 +1193,10 @@ fi
M4=$ac_cv_path_M4
if test -n "$M4"; then
echo "$as_me:1169: result: $M4" >&5
echo "$as_me:1196: result: $M4" >&5
echo "${ECHO_T}$M4" >&6
else
echo "$as_me:1172: result: no" >&5
echo "$as_me:1199: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@ -1177,7 +1204,7 @@ fi
done
test -n "$M4" || M4="m4"
echo "$as_me:1180: checking whether m4 supports frozen files" >&5
echo "$as_me:1207: checking whether m4 supports frozen files" >&5
echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" >&6
if test "${ac_cv_prog_gnu_m4+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -1189,10 +1216,10 @@ if test x"$M4" != x; then
esac
fi
fi
echo "$as_me:1192: result: $ac_cv_prog_gnu_m4" >&5
echo "$as_me:1219: result: $ac_cv_prog_gnu_m4" >&5
echo "${ECHO_T}$ac_cv_prog_gnu_m4" >&6
if test x"$ac_cv_prog_gnu_m4" != xyes; then
{ { echo "$as_me:1195: error: GNU m4 1.4 is required" >&5
{ { echo "$as_me:1222: error: GNU m4 1.4 is required" >&5
echo "$as_me: error: GNU m4 1.4 is required" >&2;}
{ (exit 1); exit; }; }
fi
@ -1204,7 +1231,7 @@ for ac_prog in mawk gawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo "$as_me:1207: checking for $ac_word" >&5
echo "$as_me:1234: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -1226,10 +1253,10 @@ fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
echo "$as_me:1229: result: $AWK" >&5
echo "$as_me:1256: result: $AWK" >&5
echo "${ECHO_T}$AWK" >&6
else
echo "$as_me:1232: result: no" >&5
echo "$as_me:1259: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@ -1237,25 +1264,25 @@ fi
done
# Generating man pages.
echo "$as_me:1240: checking for working help2man" >&5
echo "$as_me:1267: checking for working help2man" >&5
echo $ECHO_N "checking for working help2man... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (help2man --version) < /dev/null > /dev/null 2>&1; then
HELP2MAN=help2man
echo "$as_me:1247: result: found" >&5
echo "$as_me:1274: result: found" >&5
echo "${ECHO_T}found" >&6
else
HELP2MAN="$SHELL $missing_dir/missing help2man"
echo "$as_me:1251: result: missing" >&5
echo "$as_me:1278: result: missing" >&5
echo "${ECHO_T}missing" >&6
fi
# We use a path for perl so the #! line in autoscan will work.
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo "$as_me:1258: checking for $ac_word" >&5
echo "$as_me:1285: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_PERL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -1283,17 +1310,17 @@ fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
echo "$as_me:1286: result: $PERL" >&5
echo "$as_me:1313: result: $PERL" >&5
echo "${ECHO_T}$PERL" >&6
else
echo "$as_me:1289: result: no" >&5
echo "$as_me:1316: result: no" >&5
echo "${ECHO_T}no" >&6
fi
if test "$PERL" != no; then
PERLSCRIPTS=autoscan
else
{ echo "$as_me:1296: WARNING: autoscan will not be built since perl is not found" >&5
{ echo "$as_me:1323: WARNING: autoscan will not be built since perl is not found" >&5
echo "$as_me: WARNING: autoscan will not be built since perl is not found" >&2;}
fi
@ -1309,7 +1336,7 @@ fi
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo "$as_me:1312: checking for a BSD compatible install" >&5
echo "$as_me:1339: checking for a BSD compatible install" >&5
echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
@ -1358,7 +1385,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
echo "$as_me:1361: result: $INSTALL" >&5
echo "$as_me:1388: result: $INSTALL" >&5
echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@ -1513,7 +1540,7 @@ sed '/^$/d' confdefs.h >&5
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
{ echo "$as_me:1516: creating $CONFIG_STATUS" >&5
{ echo "$as_me:1543: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<\_ACEOF
#! /bin/sh
@ -1586,7 +1613,7 @@ cat >&5 << EOF
## Running config.status. ##
## ----------------------- ##
This file was extended by $as_me (Autoconf 2.49c) 2.49c, executed with
This file was extended by $as_me (GNU Autoconf 2.49c) 2.49c, executed with
> $0 $@
on `(hostname || uname -n) 2>/dev/null | sed 1q`
@ -1675,7 +1702,7 @@ cat >>$CONFIG_STATUS <<\EOF
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
{ { echo "$as_me:1678: error: ambiguous option: $1
{ { echo "$as_me:1705: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
@ -1702,12 +1729,12 @@ Try \`$0 --help' for more information." >&2;}
'tests/atconfig' ) CONFIG_FILES="$CONFIG_FILES tests/atconfig" ;;
# This is an error.
-*) { { echo "$as_me:1705: error: unrecognized option: $1
-*) { { echo "$as_me:1732: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
{ (exit 1); exit; }; } ;;
*) { { echo "$as_me:1710: error: invalid argument: $1" >&5
*) { { echo "$as_me:1737: error: invalid argument: $1" >&5
echo "$as_me: error: invalid argument: $1" >&2;}
{ (exit 1); exit; }; };;
esac
@ -1775,6 +1802,11 @@ s,@includedir@,$includedir,;t t
s,@oldincludedir@,$oldincludedir,;t t
s,@infodir@,$infodir,;t t
s,@mandir@,$mandir,;t t
s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
s,@ECHO_C@,$ECHO_C,;t t
s,@ECHO_N@,$ECHO_N,;t t
s,@ECHO_T@,$ECHO_T,;t t
@ -1909,7 +1941,7 @@ done; }
esac
if test x"$ac_file" != x-; then
{ echo "$as_me:1912: creating $ac_file" >&5
{ echo "$as_me:1944: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@ -1930,7 +1962,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]* | ?:[\\/]*)
# Absolute
test -f "$f" || { { echo "$as_me:1933: error: cannot find input file: $f" >&5
test -f "$f" || { { echo "$as_me:1965: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit; }; }
echo $f;;
@ -1943,7 +1975,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $ac_given_srcdir/$f
else
# /dev/null tree
{ { echo "$as_me:1946: error: cannot find input file: $f" >&5
{ { echo "$as_me:1978: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit; }; }
fi;;

View File

@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.49c)
AC_INIT(Autoconf, 2.49c, bug-autoconf@gnu.org)
AC_INIT(GNU Autoconf, 2.49c, bug-autoconf@gnu.org)
AC_CONFIG_SRCDIR(acgeneral.m4)
AM_INIT_AUTOMAKE(autoconf, 2.49c)

View File

@ -40,7 +40,7 @@ space-separated list of the files in which that identifier occurs.
Report bugs to <bug-autoconf@gnu.org>."
version="\
ifnames (GNU @PACKAGE@) @VERSION@
ifnames (@PACKAGE_NAME@) @VERSION@
Written by David J. MacKenzie and Paul Eggert.
Copyright 1994, 1995, 1999, 2000 Free Software Foundation, Inc.

View File

@ -40,7 +40,7 @@ space-separated list of the files in which that identifier occurs.
Report bugs to <bug-autoconf@gnu.org>."
version="\
ifnames (GNU @PACKAGE@) @VERSION@
ifnames (@PACKAGE_NAME@) @VERSION@
Written by David J. MacKenzie and Paul Eggert.
Copyright 1994, 1995, 1999, 2000 Free Software Foundation, Inc.

View File

@ -582,10 +582,14 @@ m4_popdef([AC_Prefix])dnl
# _AC_INIT_PACKAGE(PACKAGE, VERSION, [BUG-REPORT])
# ------------------------------------------------
# _AC_INIT_PACKAGE(PACKAGE-NAME, VERSION,
# [BUG-REPORT],
# [TAR-NAME = unGNU'd lower case PACKAGE-NAME])
# --------------------------------------------------------------
m4_define([_AC_INIT_PACKAGE],
[m4_define([AC_PACKAGE_NAME], [$1])
m4_define([AC_PACKAGE_TARNAME],
m4_tolower(m4_patsubst([[[$1]]], [GNU ])))
m4_define([AC_PACKAGE_VERSION], [$2])
m4_define([AC_PACKAGE_STRING], [$1 $2])
m4_define([AC_PACKAGE_BUGREPORT], [$3])
@ -739,7 +743,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
# Name of the executable.
as_me=`echo "$[0]" | sed 's,.*/,,'`
cat >config.log << EOF
cat >config.log <<EOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
@ -747,30 +751,10 @@ It was created by $as_me m4_ifset([AC_PACKAGE_STRING],
[(AC_PACKAGE_STRING) ])AC_ACVERSION, executed with
> $[0] $[@]
EOF
AS_UNAME >>config.log
## ---------- ##
## Platform. ##
## ---------- ##
hostname = $ac_hostname
uname -m = `(uname -m) 2>/dev/null || echo unknown`
uname -r = `(uname -r) 2>/dev/null || echo unknown`
uname -s = `(uname -s) 2>/dev/null || echo unknown`
uname -v = `(uname -v) 2>/dev/null || echo unknown`
/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
/bin/arch = `(/bin/arch) 2>/dev/null`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
hostinfo = `(hostinfo) 2>/dev/null`
/bin/machine = `(/bin/machine) 2>/dev/null`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
/bin/universe = `(/bin/universe) 2>/dev/null`
PATH = $PATH
cat >>config.log <<EOF
## ------------ ##
## Core tests. ##
## ------------ ##
@ -886,23 +870,36 @@ srcdir=
verbose=
x_includes=NONE
x_libraries=NONE
dnl Installation directory options.
dnl These are left unexpanded so users can "make install exec_prefix=/foo"
dnl and all the variables that are supposed to be based on exec_prefix
dnl by default will actually change.
dnl Use braces instead of parens because sh, perl, etc. also accept them.
AC_SUBST(bindir, '${exec_prefix}/bin')dnl
AC_SUBST(sbindir, '${exec_prefix}/sbin')dnl
AC_SUBST(libexecdir, '${exec_prefix}/libexec')dnl
AC_SUBST(datadir, '${prefix}/share')dnl
AC_SUBST(sysconfdir, '${prefix}/etc')dnl
AC_SUBST(sharedstatedir, '${prefix}/com')dnl
AC_SUBST(localstatedir, '${prefix}/var')dnl
AC_SUBST(libdir, '${exec_prefix}/lib')dnl
AC_SUBST(includedir, '${prefix}/include')dnl
AC_SUBST(oldincludedir, '/usr/include')dnl
AC_SUBST(infodir, '${prefix}/info')dnl
AC_SUBST(mandir, '${prefix}/man')dnl
# Installation directory options.
# These are left unexpanded so users can "make install exec_prefix=/foo"
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
AC_SUBST([bindir], ['${exec_prefix}/bin'])dnl
AC_SUBST([sbindir], ['${exec_prefix}/sbin'])dnl
AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])dnl
AC_SUBST([datadir], ['${prefix}/share'])dnl
AC_SUBST([sysconfdir], ['${prefix}/etc'])dnl
AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl
AC_SUBST([localstatedir], ['${prefix}/var'])dnl
AC_SUBST([libdir], ['${exec_prefix}/lib'])dnl
AC_SUBST([includedir], ['${prefix}/include'])dnl
AC_SUBST([oldincludedir], ['/usr/include'])dnl
AC_SUBST([infodir], ['${prefix}/info'])dnl
AC_SUBST([mandir], ['${prefix}/man'])dnl
# Identity of this package.
AC_SUBST([PACKAGE_NAME],
[m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])])dnl
AC_SUBST([PACKAGE_TARNAME],
[m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])])dnl
AC_SUBST([PACKAGE_VERSION],
[m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])])dnl
AC_SUBST([PACKAGE_STRING],
[m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])])dnl
AC_SUBST([PACKAGE_BUGREPORT],
[m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])dnl
ac_prev=
for ac_option

View File

@ -94,16 +94,24 @@ m4_divert_push([DEFAULT])dnl
AS_SHELL_SANITIZE
# Name of the executable.
as_me=`echo "$[0]" | sed 's,.*/,,'`
. ./atconfig
# Use absolute file notations, as the test might change directories.
at_srcdir=`cd "$srcdir" && pwd`
at_top_srcdir=`cd "$top_srcdir" && pwd`
if test -n "$AUTOTEST_PATH"; then
export PATH; PATH=`pwd`:`cd "$AUTOTEST_PATH" && pwd`:$PATH
else
export PATH; PATH=`pwd`:$PATH
fi
# Don't take risks: use absolute path names.
at_path=`pwd`
at_IFS_save=$IFS
IFS=:
for at_dir in $AUTOTEST_PATH:$PATH; do
at_path=$at_path:`cd "$at_dir" && pwd`
done
IFS=$at_IFS_save
PATH=$at_path
export PATH
test -f atlocal && . ./atlocal
@ -193,7 +201,7 @@ fi
# over files, the full test suite cleans up both before and after test groups.
if $1 --version | grep "$at_package.*$at_version" >/dev/null; then
AS_BOX([Testing suite for $at_package, version $at_version])
AS_BOX([Testing suite for $at_package $at_version])
else
AS_BOX([ERROR: Not using the proper version, no tests performed])
exit 1
@ -278,11 +286,15 @@ elif test $at_debug = false; then
echo 'case the testsuite provide a good starting point.'
echo
echo 'Now, failed tests will be executed again, verbosely, and logged'
echo 'in the file '$[0]'.log. When sending this file to the maintainers,'
echo 'be careful to give at least all the information you have: version'
echo 'numbers, decription of your environment etc.'
${CONFIG_SHELL-/bin/sh} $[0] -v -d $at_failed_list 2>&1 | tee $[0].log
echo 'in the file '$[0]'.log.'
AS_UNAME >$[0].log
${CONFIG_SHELL-/bin/sh} $[0] -v -d $at_failed_list 2>&1 | tee -a $[0].log
AS_BOX([$[0].log is created])
echo
echo "Please send \`$[0].log' to <$at_bugreport> together with as"
echo 'information as you think might help.'
exit 1
fi

View File

@ -381,3 +381,36 @@ $debug ||
AS_EXIT
}dnl
])# AS_TMPDIR
# AS_UNAME
# --------
# Try to describe this machine. Meant for logs.
m4_define([AS_UNAME],
[{
cat <<_ASUNAME
## ---------- ##
## Platform. ##
## ---------- ##
hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
uname -m = `(uname -m) 2>/dev/null || echo unknown`
uname -r = `(uname -r) 2>/dev/null || echo unknown`
uname -s = `(uname -s) 2>/dev/null || echo unknown`
uname -v = `(uname -v) 2>/dev/null || echo unknown`
/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
PATH = $PATH
_ASUNAME
}])

View File

@ -2,12 +2,15 @@
## Prepare for testing. ##
## ----------------------##
#serial 2
# Single argument says where are built sources to test, relative to the
# built test directory. Maybe omitted if the same (flat distribution).
#serial 3
# AT_CONFIG([AUTOTEST-PATH = .])
# ------------------------------
# Configure the test suite.
#
# AUTOTEST-PATH must help the test suite to find the executables, i.e.,
# if the test suite is in `tests/' and the executables are in `src/',
# pass `../src'. If there are also executables in the source tree, use
# `../src:$top_srcdir/src'.
AC_DEFUN([AT_CONFIG],
[AUTOTEST_PATH=ifelse([$1], [], [.], [$1])
AC_SUBST(AUTOTEST_PATH)
])
[AC_SUBST([AUTOTEST_PATH], [m4_default([$1], [.])])])

33
m4sh.m4
View File

@ -381,3 +381,36 @@ $debug ||
AS_EXIT
}dnl
])# AS_TMPDIR
# AS_UNAME
# --------
# Try to describe this machine. Meant for logs.
m4_define([AS_UNAME],
[{
cat <<_ASUNAME
## ---------- ##
## Platform. ##
## ---------- ##
hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
uname -m = `(uname -m) 2>/dev/null || echo unknown`
uname -r = `(uname -r) 2>/dev/null || echo unknown`
uname -s = `(uname -s) 2>/dev/null || echo unknown`
uname -v = `(uname -v) 2>/dev/null || echo unknown`
/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
PATH = $PATH
_ASUNAME
}])

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
.TH AUTOCONF "1" "January 2001" "GNU autoconf 2.49c" FSF
.TH AUTOCONF "1" "January 2001" "autoconf (@PACKAGE_NAME@) 2.49c" FSF
.SH NAME
autoconf \- Generate configuration scripts
.SH SYNOPSIS

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
.TH AUTOHEADER "1" "January 2001" "GNU autoconf 2.49c" FSF
.TH AUTOHEADER "1" "January 2001" "autoheader (@PACKAGE_NAME@) 2.49c" FSF
.SH NAME
autoheader \- Create a template header for configure
.SH SYNOPSIS

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
.TH AUTORECONF "1" "January 2001" "GNU autoconf 2.49c" FSF
.TH AUTORECONF "1" "January 2001" "autoreconf (@PACKAGE_NAME@) 2.49c" FSF
.SH NAME
autoreconf \- Update generated configuration files
.SH SYNOPSIS

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
.TH AUTOSCAN "1" "January 2001" "GNU autoconf 2.49c" FSF
.TH AUTOSCAN "1" "January 2001" "GNU Autoconf 2.49c" FSF
.SH NAME
autoscan \- Generate a preliminary configure.in
.SH SYNOPSIS

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
.TH AUTOUPDATE "1" "January 2001" "GNU autoconf 2.49c" FSF
.TH AUTOUPDATE "1" "January 2001" "autoupdate (@PACKAGE_NAME@) 2.49c" FSF
.SH NAME
autoupdate \- Update a configure.in to a newer Autoconf
.SH SYNOPSIS

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
.TH IFNAMES "1" "January 2001" "GNU autoconf 2.49c" FSF
.TH IFNAMES "1" "January 2001" "ifnames (@PACKAGE_NAME@) 2.49c" FSF
.SH NAME
ifnames \- Extract CPP conditionals from a set of files
.SH SYNOPSIS

View File

@ -84,7 +84,7 @@ CLEANFILES = debug-*.sh macro configure configure.in configure.ac c
DISTCLEANFILES = atconfig testsuite
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES = atconfig
DIST_COMMON = README Makefile.am Makefile.in atconfig.in
DIST_COMMON = README Makefile.am Makefile.in atconfig.in configure
PACKAGE = @PACKAGE@

View File

@ -48,14 +48,16 @@
# This debugging script has been automatically generated from `make check'.
# Call it with `--help' to get a quick usage summary.
at_package=@PACKAGE@
at_version=@VERSION@
at_n=@ECHO_N@
at_package='@PACKAGE_NAME@'
at_version='@PACKAGE_VERSION@'
at_bugreport='@PACKAGE_BUGREPORT@'
at_n='@ECHO_N@'
at_c='@ECHO_C@'
srcdir=@srcdir@
top_srcdir=@top_srcdir@
AUTOTEST_PATH=@AUTOTEST_PATH@
srcdir='@srcdir@'
top_srcdir='@top_srcdir@'
AUTOTEST_PATH='@AUTOTEST_PATH@'
# We need GNU m4.
M4=@M4@
M4='@M4@'

View File

@ -94,16 +94,24 @@ m4_divert_push([DEFAULT])dnl
AS_SHELL_SANITIZE
# Name of the executable.
as_me=`echo "$[0]" | sed 's,.*/,,'`
. ./atconfig
# Use absolute file notations, as the test might change directories.
at_srcdir=`cd "$srcdir" && pwd`
at_top_srcdir=`cd "$top_srcdir" && pwd`
if test -n "$AUTOTEST_PATH"; then
export PATH; PATH=`pwd`:`cd "$AUTOTEST_PATH" && pwd`:$PATH
else
export PATH; PATH=`pwd`:$PATH
fi
# Don't take risks: use absolute path names.
at_path=`pwd`
at_IFS_save=$IFS
IFS=:
for at_dir in $AUTOTEST_PATH:$PATH; do
at_path=$at_path:`cd "$at_dir" && pwd`
done
IFS=$at_IFS_save
PATH=$at_path
export PATH
test -f atlocal && . ./atlocal
@ -193,7 +201,7 @@ fi
# over files, the full test suite cleans up both before and after test groups.
if $1 --version | grep "$at_package.*$at_version" >/dev/null; then
AS_BOX([Testing suite for $at_package, version $at_version])
AS_BOX([Testing suite for $at_package $at_version])
else
AS_BOX([ERROR: Not using the proper version, no tests performed])
exit 1
@ -278,11 +286,15 @@ elif test $at_debug = false; then
echo 'case the testsuite provide a good starting point.'
echo
echo 'Now, failed tests will be executed again, verbosely, and logged'
echo 'in the file '$[0]'.log. When sending this file to the maintainers,'
echo 'be careful to give at least all the information you have: version'
echo 'numbers, decription of your environment etc.'
${CONFIG_SHELL-/bin/sh} $[0] -v -d $at_failed_list 2>&1 | tee $[0].log
echo 'in the file '$[0]'.log.'
AS_UNAME >$[0].log
${CONFIG_SHELL-/bin/sh} $[0] -v -d $at_failed_list 2>&1 | tee -a $[0].log
AS_BOX([$[0].log is created])
echo
echo "Please send \`$[0].log' to <$at_bugreport> together with as"
echo 'information as you think might help.'
exit 1
fi