* acgeneral.m4 (AC_LIBOBJ_DECL): Remove.

(AC_LIBSOURCES, AC_LIBSOURCE): New.
* acgeneral.m4 (_AC_OUTPUT_SUBDIRS): Remove configure.ac

diff --git a/ChangeLog b/ChangeLog
index 5d834d4923b625d98f33e0146629f194d0a1376c..4a69c98a6e5c21f9470d6f10268890a7427d2d25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2001-02-03  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (AC_LIBOBJ_DECL): Remove.
+       (AC_LIBSOURCES, AC_LIBSOURCE): New.
+
+       * acgeneral.m4 (_AC_OUTPUT_SUBDIRS): Remove configure.ac
+
+<<<<<<< ChangeLog
+2001-02-02  Akim Demaille  <akim@epita.fr>
+
+       * tests/base.at (AC_TRY_COMMAND): Fix the test.
+       From Nicolas Joly.
+
+       The following patch went into Autoconf between the two previous
+       entries:
+
+       * acgeneral.m4 (AC_TRY_COMMAND): Use the old code, using a tmp
+       variable, to recover multiline robustness.
+       Reported by Tim Van Holder.
+       * tests/base.at (AC_TRY_COMMAND): New.
+
+=======
 2001-02-02  Pavel Roskin  <proski@gnu.org>
 
        * acgeneral.m4 (_AC_COMPUTE_INT_COMPILE): Rename all occurences
@@ -12,6 +34,7 @@
        (scan_sh_file): Likewise.
        Thanks to Jim Meyering for improved implementation.
 
+>>>>>>> 1.1270
 2001-02-01  Pavel Roskin  <proski@gnu.org>
 
        * autoreconf.sh: Fix the case when the verbose output was not
@@ -19,7 +42,7 @@
 
 2001-01-30  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
-       * acgeneral.m4 (_AC_OUTPUT_SUBDIRS): Remove configure.ac 
+       * acgeneral.m4 (_AC_OUTPUT_SUBDIRS): Remove configure.ac
        from check for ac_sub_configure.
 
 2001-01-30  Akim Demaille  <akim@epita.fr>

diff --git a/acgeneral.m4 b/acgeneral.m4
index 4efc4fc8a20998132ab7f161dcc0b75726ac59bf..1c639653016945c5c49ce0839a5af3ccff6f8e48 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2983,10 +2983,18 @@ $3],
 ## -------------------------------- ##
 
 
-# AC_LIBOBJ_DECL(FILENAME-NOEXT)
-# ------------------------------
-# Announce we might need the file `FILENAME-NOEXT.c'.
-m4_define([AC_LIBOBJ_DECL], [])
+# AC_LIBSOURCE(FILENAME)
+# ----------------------
+# Announce we might need the file `FILENAME'.
+m4_define([AC_LIBSOURCE], [])
+
+
+# AC_LIBSOURCES([FILENAME1, ...])
+# -------------------------------
+# Announce we might need these files.
+m4_define([AC_LIBSOURCES],
+[m4_foreach([_AC_FILENAME], [$1],
+            [AC_LIBSOURCE(_AC_FILENAME)])])
 
 
 # _AC_LIBOBJ(FILENAME-NOEXT, ACTION-IF-INDIR)
@@ -2995,7 +3003,7 @@ m4_define([AC_LIBOBJ_DECL], [])
 # We don't use AC_SUBST/2 because it forces an unneeded eol.
 m4_define([_AC_LIBOBJ],
 [AS_LITERAL_IF([$1],
-               [AC_LIBOBJ_DECL([$1])],
+               [AC_LIBSOURCE([$1])],
                [$2])dnl
 AC_SUBST([LIBOBJS])dnl
 LIBOBJS="$LIBOBJS $1.$ac_objext"])

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 4efc4fc8a20998132ab7f161dcc0b75726ac59bf..1c639653016945c5c49ce0839a5af3ccff6f8e48 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2983,10 +2983,18 @@ $3],
 ## -------------------------------- ##
 
 
-# AC_LIBOBJ_DECL(FILENAME-NOEXT)
-# ------------------------------
-# Announce we might need the file `FILENAME-NOEXT.c'.
-m4_define([AC_LIBOBJ_DECL], [])
+# AC_LIBSOURCE(FILENAME)
+# ----------------------
+# Announce we might need the file `FILENAME'.
+m4_define([AC_LIBSOURCE], [])
+
+
+# AC_LIBSOURCES([FILENAME1, ...])
+# -------------------------------
+# Announce we might need these files.
+m4_define([AC_LIBSOURCES],
+[m4_foreach([_AC_FILENAME], [$1],
+            [AC_LIBSOURCE(_AC_FILENAME)])])
 
 
 # _AC_LIBOBJ(FILENAME-NOEXT, ACTION-IF-INDIR)
@@ -2995,7 +3003,7 @@ m4_define([AC_LIBOBJ_DECL], [])
 # We don't use AC_SUBST/2 because it forces an unneeded eol.
 m4_define([_AC_LIBOBJ],
 [AS_LITERAL_IF([$1],
-               [AC_LIBOBJ_DECL([$1])],
+               [AC_LIBSOURCE([$1])],
                [$2])dnl
 AC_SUBST([LIBOBJS])dnl
 LIBOBJS="$LIBOBJS $1.$ac_objext"])

diff --git a/man/autoreconf.1 b/man/autoreconf.1
index 7483899fbc898ec5df9daf3b64ded816a57362df..8d7836c807f0a9a8874d7faa671f40759110c02c 100644 (file)
--- a/man/autoreconf.1
+++ b/man/autoreconf.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTORECONF "1" "January 2001" "GNU Autoconf 2.49d" FSF
+.TH AUTORECONF "1" "February 2001" "GNU Autoconf 2.49d" FSF
 .SH NAME
 autoreconf \- Update generated configuration files
 .SH SYNOPSIS

diff --git a/man/autoscan.1 b/man/autoscan.1
index b343156ac4caa58f907c1b8ed50404398f9f3c33..f3eb6b51dd0b420b46d43ece98acab471e94304f 100644 (file)
--- a/man/autoscan.1
+++ b/man/autoscan.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOSCAN "1" "January 2001" "GNU Autoconf 2.49d" FSF
+.TH AUTOSCAN "1" "February 2001" "GNU Autoconf 2.49d" FSF
 .SH NAME
 autoscan \- Generate a preliminary configure.in
 .SH SYNOPSIS

diff --git a/tests/base.at b/tests/base.at
index 57317b991c4fe3d8a7c97abcbc9d36fcc3852fed..3fc074ae84a6b89ef90aaba552427296055afb7e 100644 (file)
--- a/tests/base.at
+++ b/tests/base.at
@@ -228,7 +228,7 @@ AT_DATA([configure.ac],
 
 if AC_TRY_COMMAND([(echo "The Cat in the Hat"
                     echo "The Hat in the Cat" >&2)
-                  | grep ^The\ Cat\ in\ The\ Hat\$ >/dev/null]); then
+                  | grep ^The\ Cat\ in\ the\ Hat\$ >/dev/null]); then
   # Cool!
 else
   AC_MSG_ERROR([Didn't see the Cat in the Hat!])
@@ -236,7 +236,7 @@ fi
 
 if AC_TRY_COMMAND([(echo "The Cat in the Hat"
                     echo "The Hat in the Cat" >&2)
-                  | grep ^The\ Hat\ in\ The\ Cat\$ >/dev/null]); then
+                  | grep ^The\ Hat\ in\ the\ Cat\$ >/dev/null]); then
   AC_MSG_ERROR([Saw the Hat in the Cat!])
 fi
 ]])