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

* tests/atspecific.m4 (AT_CHECK_AUTOUPDATE): Be robust to missing

Browse Source 
or broken autoupdate.
* tests/tools.at: Likewise.
* tests/Makefile.am (CLEANFILES): Also clean Libtool files.
This commit is contained in:
Akim Demaille 2001-04-20 13:07:09 +00:00
parent aad2b3fecd
commit 6b6c7f7b9f
6 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2001-04-20 Nicolas Joly <njoly@pasteur.fr>
* tests/atspecific.m4 (AT_CHECK_AUTOUPDATE): Be robust to missing
or broken autoupdate.
* tests/tools.at: Likewise.
* tests/Makefile.am (CLEANFILES): Also clean Libtool files.
2001-04-18 Tim Van Holder <tim.van.holder@pandora.be>
* acgeneral.m4 (_AC_INIT_SRCDIR): Handle

4
configure vendored
View File

@ -496,7 +496,7 @@ if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then its parent.
ac_prog=$0
ac_confdir=`echo "$ac_prog" | sed 's%/[^/][^/]*$%%'`
ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
srcdir=$ac_confdir
if test ! -r $srcdir/$ac_unique_file; then
@ -514,7 +514,7 @@ if test ! -r $srcdir/$ac_unique_file; then
{ (exit 1); exit 1; }; }
fi
fi
srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'`
srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
ac_env_build_alias_set=${build_alias+set}
ac_env_build_alias_value=$build_alias
ac_cv_env_build_alias_set=${build_alias+set}

3
tests/Makefile.am
View File

@ -76,7 +76,8 @@ actypes.at: mktests.sh $(MACRO_FILES)
CLEANFILES = debug-*.sh macro configure configure.in configure.ac \
config.status config.cache config.log config.h.in config.h \
stderr stdout empty
stderr stdout empty \
config.guess config.sub expr libtool ltconfig ltmain.sh install-sh
DISTCLEANFILES = atconfig testsuite

4
tests/Makefile.in
View File

@ -84,12 +84,12 @@ EXTRA_DIST = README atgeneral.m4 atspecific.m4 aclocal.m4
MACRO_FILES = ../acgeneral.m4 ../acspecific.m4 ../acfunctions.m4 ../aclang.m4 ../acheaders.m4 ../actypes.m4
CLEANFILES = debug-*.sh macro configure configure.in configure.ac config.status config.cache config.log config.h.in config.h stderr stdout empty
CLEANFILES = debug-*.sh macro configure configure.in configure.ac config.status config.cache config.log config.h.in config.h stderr stdout empty config.guess config.sub expr libtool ltconfig ltmain.sh install-sh
DISTCLEANFILES = atconfig testsuite
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES = atconfig
DIST_COMMON = README Makefile.am Makefile.in atconfig.in configure
DIST_COMMON = README Makefile.am Makefile.in atconfig.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

3
tests/atspecific.m4
View File

@ -104,7 +104,8 @@ m4_define([AT_CHECK_DEFINES],
# AT_CHECK_AUTOUPDATE
# -------------------
m4_define([AT_CHECK_AUTOUPDATE],
[AT_CHECK([autoupdate --autoconf-dir $at_top_srcdir], 0,
[AT_CHECK([autoupdate --version || exit 77], ignore, ignore, ignore)
AT_CHECK([autoupdate --autoconf-dir $at_top_srcdir], 0,
[], [autoupdate: `configure.ac' is updated
])])

9
tests/tools.at
View File

@ -431,9 +431,7 @@ AC_OUTPUT
]])
# Checking `autoupdate'.
AT_CHECK([autoupdate --autoconf-dir $top_srcdir], 0, [],
[autoupdate: `configure.ac' is updated
])
AT_CHECK_AUTOUPDATE
AT_CHECK([cat configure.ac], 0, [expout])
# Checking that `autoupdate' is idempotent
AT_CHECK([autoupdate --autoconf-dir $top_srcdir], 0, [],
@ -460,9 +458,7 @@ AT_DATA(dst2, dst2
)
# Checking `autoupdate'.
AT_CHECK([autoupdate --autoconf-dir $top_srcdir], 0, [],
[autoupdate: `configure.ac' is updated
])
AT_CHECK_AUTOUPDATE
AT_CHECK_AUTOCONF
AT_CHECK_CONFIGURE
AT_CHECK([cat src1], 0, [dst1
@ -481,6 +477,7 @@ cat >expout <<EOF
AC_PREREQ($at_version)
EOF
AT_CHECK([autoupdate --version || exit 77], ignore, ignore, ignore)
AT_CHECK([echo "AC_PREREQ(1.0)" |
autoupdate --autoconf-dir $top_srcdir -],
0, [expout], [])