26-fyi-fix-tests.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * m4/regex.m4: Use AC_LIBOBJ.
        Require 2.50, and use AC_LIBSOURCES freely.
        * tests/asm.tests: Formatting changes.
        Exercise AM_PROG_AS.

Index: m4/as.m4
--- m4/as.m4 Sun, 23 Sep 2001 08:36:36 +0200 akim
+++ m4/as.m4 Sun, 21 Oct 2001 13:33:54 +0200 akim
@@ -1,4 +1,6 @@
-# Figure out how to run the assembler.
+# Figure out how to run the assembler.             -*- Autoconf -*-
+
+# serial 2

 # Copyright 2001 Free Software Foundation, Inc.

@@ -18,6 +20,7 @@
 # 02111-1307, USA.

 # AM_PROG_AS
+# ----------
 AC_DEFUN([AM_PROG_AS],
 [# By default we simply use the C compiler to build assembly code.
 AC_REQUIRE([AC_PROG_CC])
Index: m4/regex.m4
--- m4/regex.m4 Sun, 23 Sep 2001 08:36:36 +0200 akim
+++ m4/regex.m4 Sun, 21 Oct 2001 13:46:34 +0200 akim
@@ -1,4 +1,4 @@
-## --------------------------------- ##
+## --------------------------------- ##              -*- Autoconf -*-
 ## Check if --with-regex was given.  ##
 ## --------------------------------- ##

@@ -19,7 +19,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.

-# serial 2
+# serial 3
+AC_PREREQ(2.50)

 # AM_WITH_REGEX
 # -------------
@@ -37,8 +38,7 @@
 # FIXME: This macro seems quite obsolete now since rx doesn't seem to
 # be maintained, while regex is.
 AC_DEFUN([AM_WITH_REGEX],
-[ifdef([AC_LIBSOURCES],
-       [AC_LIBSOURCES([rx.h, rx.c, regex.c, regex.h])])dnl
+[AC_LIBSOURCES([rx.h, rx.c, regex.c, regex.h])dnl
 AC_MSG_CHECKING([which of GNU rx or gawk's regex is wanted])
 AC_ARG_WITH(regex,
 [  --without-regex         use GNU rx in lieu of gawk's regex for matching],
@@ -53,11 +53,11 @@ AC_DEFUN([AM_WITH_REGEX],
                 [am_cv_gnu_regex=yes],
                  [am_cv_gnu_regex=no])])
   if test $am_cv_gnu_regex = no; then
-    LIBOBJS="$LIBOBJS regex.$ac_objext"
+    AC_LIBOBJ([regex])
   fi
 else
   AC_MSG_RESULT(rx)
-  AC_CHECK_FUNC(re_rx_search, , [LIBOBJS="$LIBOBJS rx.$ac_objext"])
+  AC_CHECK_FUNC(re_rx_search, , [AC_LIBOBJ([rx])])
 fi
 AC_SUBST(LIBOBJS)dnl
 ])
Index: tests/Makefile.in
--- tests/Makefile.in Sun, 21 Oct 2001 12:47:24 +0200 akim
+++ tests/Makefile.in Sun, 21 Oct 2001 13:30:48 +0200 akim
@@ -60,16 +60,32 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AWK = @AWK@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBS = @LIBS@
+MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
 PERL = @PERL@
+SET_MAKE = @SET_MAKE@
 VERSION = @VERSION@
-am__include = @am__include@
-am__quote = @am__quote@
+build_alias = @build_alias@
+host_alias = @host_alias@
 install_sh = @install_sh@
+program_transform_name = @program_transform_name@
+target_alias = @target_alias@

 XFAIL_TESTS = subdir5.test auxdir2.test cond17.test

@@ -226,7 +242,6 @@
 info.test \
 insh.test \
 insh2.test \
-install.test \
 install2.test \
 installsh.test \
 instdata.test \
Index: tests/asm.test
--- tests/asm.test Sat, 20 Oct 2001 12:29:22 +0200 akim
+++ tests/asm.test Sun, 21 Oct 2001 13:43:33 +0200 akim
@@ -4,13 +4,6 @@

 . $srcdir/defs || exit 1

-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_SUBST(ASFLAGS)
-AC_OUTPUT(Makefile)
-END
-
 cat > Makefile.am << 'END'
 noinst_PROGRAMS = maude
 maude_SOURCES = maude.s
@@ -18,11 +11,20 @@

 : > maude.s

-# Should fail because we need cc and as.
+# Should fail because we need CC and AS.
 echo 1
+cat > configure.in << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_SUBST(ASFLAGS)
+AC_OUTPUT(Makefile)
+END
+
 $ACLOCAL || exit 1
 $AUTOMAKE && exit 1

+# We still need AS.
+echo 2
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -31,11 +33,11 @@
 AC_OUTPUT(Makefile)
 END

-# We still need as.
-echo 2
 $ACLOCAL || exit 1
 $AUTOMAKE && exit 1

+# We need ASFLAGS.
+echo 3
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -45,11 +47,11 @@
 AC_OUTPUT(Makefile)
 END

-# We need ASFLAGS.
-echo 3
 $ACLOCAL || exit 1
 $AUTOMAKE && exit 1

+# We have every needed, expect a success.
+echo 4
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -60,6 +62,19 @@
 AC_OUTPUT(Makefile)
 END

-echo 4
-$ACLOCAL || exit 1
-$AUTOMAKE
+$ACLOCAL  || exit 1
+$AUTOMAKE || exit 1
+
+
+# We have every needed, expect a success.
+echo 5
+cat > configure.in << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_PROG_AS
+END
+
+$ACLOCAL  || exit 1
+$AUTOMAKE || exit 1
+
+exit 0