* tests/Makefile.am (TESTS): Added aclibobj.test.

	* tests/aclibobj.test: New file.
	* automake.in (handle_lib_objects_cond): Avoid undefined variable
	error.
	(scan_one_autoconf_file): Handle AC_LIBSOURCE and AC_LIBSOURCES.

diff --git a/ChangeLog b/ChangeLog
index 07814ef34c5f92426766dec883b3bc8aa530e5b7..dfc98187f521f51f794a973fd0a220f2235499a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-07-30  Tom Tromey  <tromey@redhat.com>
 
+       * tests/Makefile.am (TESTS): Added aclibobj.test.
+       * tests/aclibobj.test: New file.
+       * automake.in (handle_lib_objects_cond): Avoid undefined variable
+       error.
+       (scan_one_autoconf_file): Handle AC_LIBSOURCE and AC_LIBSOURCES.
+
        * automake.texi (Dist): Mention other distribution types.
        (Install): Updates.
 

diff --git a/automake.in b/automake.in
index f0ff3213f2b1bb774a6915fa998dad9b731093f4..c61b9e525b682d98b2fd8f433f6288fdb9e08305 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2174,14 +2174,15 @@ sub handle_lib_objects_cond
        # means adding entries to dep_files.
        if ($lsearch =~ /^\@(LT)?LIBOBJS\@$/)
        {
+           my $lt = $1 ? $1 : '';
            my $myobjext = ($1 ? 'l' : '') . 'o';
 
            push (@dep_list, $lsearch);
            $seen_libobjs = 1;
            if (! keys %libsources
-               && ! &variable_defined ($1 . 'LIBOBJS'))
+               && ! &variable_defined ($lt . 'LIBOBJS'))
            {
-               &am_line_error ($var, "\@$1" . "LIBOBJS\@ seen but never set in `$configure_ac'");
+               &am_line_error ($var, "\@$lt" . "LIBOBJS\@ seen but never set in `$configure_ac'");
            }
 
            foreach my $iter (keys %libsources)
@@ -2216,11 +2217,12 @@ sub handle_lib_objects_cond
        }
        elsif ($lsearch =~ /^\@(LT)?ALLOCA\@$/)
        {
+           my $lt = $1 ? $1 : '';
            my $myobjext = ($1 ? 'l' : '') . 'o';
 
            push (@dep_list, $lsearch);
            &am_line_error ($var,
-                           "\@$1" . "ALLOCA\@ seen but `AC_FUNC_ALLOCA' not in `$configure_ac'")
+                           "\@$lt" . "ALLOCA\@ seen but `AC_FUNC_ALLOCA' not in `$configure_ac'")
                if ! defined $libsources{'alloca.c'};
            $dep_files{'$(DEPDIR)/alloca.P' . $myobjext} = 1;
            &require_file_with_line ($var, $FOREIGN, 'alloca.c');
@@ -4482,6 +4484,17 @@ sub scan_one_autoconf_file
        {
            $libsources{"$1.c"} = 1;
        }
+        elsif (/AC_LIBSOURCE\(([^)]+)\)/)
+       {
+           $libsources{&unquote_m4_arg ($1)} = 1;
+       }
+        elsif (/AC_LIBSOURCES\(([^)]+)\)/)
+       {
+           foreach my $lc_iter (split (/[, ]+/, &unquote_m4_arg ($1)))
+           {
+               $libsources{$lc_iter} = 1;
+           }
+       }
 
        if (! $in_ac_replace && s/AC_REPLACE_FUNCS\s*\(\[?//)
        {

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 089cb18a0a534bb84856393cc2a89430fc2a5aed..aa8e64f309f986fb1a150e66c6834fc162f2eab4 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,6 +4,7 @@ XFAIL_TESTS = subdir5.test auxdir2.test
 
 TESTS =        \
 acinclude.test \
+aclibobj.test \
 aclocal.test \
 aclocali.test \
 aclocali1.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 900e5d6ee1b2a14112a28655cc94784cedeac5f3..d1a8dc00241c6db2f9647fcdb382ba273e8563e9 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -70,6 +70,7 @@ XFAIL_TESTS = subdir5.test auxdir2.test
 
 TESTS = \
 acinclude.test \
+aclibobj.test \
 aclocal.test \
 aclocali.test \
 aclocali1.test \

diff --git a/tests/aclibobj.test b/tests/aclibobj.test
new file mode 100755 (executable)
index 0000000..1bcbc5e
--- /dev/null
+++ b/tests/aclibobj.test
@@ -0,0 +1,33 @@
+#! /bin/sh
+
+# Make sure AC_LIBOBJ and friends work.
+
+. $srcdir/defs || exit 1
+
+cat > X << 'END'
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = @LIBOBJS@
+END
+
+: > maude.c
+: > liver.c
+
+$ACLOCAL
+
+set -e
+
+cp X configure.in
+echo 'AC_LIBSOURCE(maude.c)' >> configure.in
+$AUTOMAKE
+
+cp X configure.in
+echo 'AC_LIBSOURCES([maude.c, liver.c])' >> configure.in
+$AUTOMAKE