From 6b6c7f7b9f81ef2b7865d9d864bd22a65a30719d Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Fri, 20 Apr 2001 13:07:09 +0000
Subject: [PATCH] * 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.

---
 ChangeLog           | 7 +++++++
 configure           | 4 ++--
 tests/Makefile.am   | 3 ++-
 tests/Makefile.in   | 4 ++--
 tests/atspecific.m4 | 3 ++-
 tests/tools.at      | 9 +++------
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2744f72c..bb64f7af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/configure b/configure
index 49e5f7b6..d53fcc54 100755
--- a/configure
+++ b/configure
@@ -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}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b102499c..e48a3c46 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -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
 
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index e60d8b52..e98cab8f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -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)
diff --git a/tests/atspecific.m4 b/tests/atspecific.m4
index 63935b05..8edddbea 100644
--- a/tests/atspecific.m4
+++ b/tests/atspecific.m4
@@ -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
 ])])
 
diff --git a/tests/tools.at b/tests/tools.at
index bef9dbbc..cc170795 100644
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -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], [])