Re: fix coreutils' "make distcheck": remove AC_CONFIG_LIBOBJ_DIR(lib)

[Ralf Wildenhues]

Hello Stepan,

* Stepan Kasal wrote on Tue, Oct 17, 2006 at 12:02:05PM CEST:
> 
> I think that the patch has broken the error message in the
> procedure.  Attached is a proposed patch.

Thanks.  With the typo in your patch fixed, and testsuite exposure
added as below, OK for HEAD and branch-1-10?  Is the branch intended
to be kept open for bug fixes, or is that wasted work?

Cheers,
Ralf

2006-10-17  Stepan Kasal  <address@hidden>
            Ralf Wildenhues  <address@hidden>

        * automake.in (handle_LIBOBJS_or_ALLOCA): Fix the error message.
        * tests/pr401.test: Update to expose the error.
        * tests/pr401b.test: Likewise.
        * tests/pr401c.test: Likewise.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1641
diff -u -r1.1641 automake.in
--- automake.in 16 Oct 2006 05:24:17 -0000      1.1641
+++ automake.in 17 Oct 2006 17:43:44 -0000
@@ -2209,11 +2211,10 @@
          # If LTLIBOBJS is used, we must also clear LIBOBJS (which might
          # be created by libtool as a side-effect of creating LTLIBOBJS).
          $clean_files{"\$($var)"} = MOSTLY_CLEAN if $var =~ s/^LT//;
-
        }
       else
        {
-         error ("`\$($var)' cannot be used outside `$dir' if"
+         error ("`\$($var)' cannot be used outside `$config_libobj_dir' if"
                 . " `subdir-objects' is not set");
        }
     }
Index: tests/pr401.test
===================================================================
RCS file: /cvs/automake/automake/tests/pr401.test,v
retrieving revision 1.5
diff -u -r1.5 pr401.test
--- tests/pr401.test    14 Oct 2006 17:12:50 -0000      1.5
+++ tests/pr401.test    17 Oct 2006 17:43:44 -0000
@@ -88,7 +88,6 @@
 ./configure
 $MAKE distcheck
 
-
 ## ------------------------------------------ ##
 ## Traditional LIBOBJS with LIBOBJDIR set.    ##
 ## ------------------------------------------ ##
@@ -106,6 +105,16 @@
 test ! -d lib/lib
 $MAKE distcheck
 
+## -------------------------------------------- ##
+## Error message with usage in wrong directory. ##
+## -------------------------------------------- ##
+
+mv -f src/Makefile.am src/t
+sed 's/LDADD = .*/LDADD = @LIBOBJS@/' src/t > src/Makefile.am
+AUTOMAKE_fails
+grep 'cannot be used outside.*lib' stderr
+mv -f src/t src/Makefile.am
+
 
 ## -------------------------------------------- ##
 ## Test using LIBOBJS from a sibling directory. ##
Index: tests/pr401b.test
===================================================================
RCS file: /cvs/automake/automake/tests/pr401b.test,v
retrieving revision 1.5
diff -u -r1.5 pr401b.test
--- tests/pr401b.test   14 Oct 2006 17:12:50 -0000      1.5
+++ tests/pr401b.test   17 Oct 2006 17:43:44 -0000
@@ -107,6 +107,15 @@
 test ! -d lib/lib
 $MAKE distcheck
 
+## -------------------------------------------- ##
+## Error message with usage in wrong directory. ##
+## -------------------------------------------- ##
+
+mv -f src/Makefile.am src/t
+sed 's/LDADD = .*/LDADD = @LTLIBOBJS@/' src/t > src/Makefile.am
+AUTOMAKE_fails
+grep 'cannot be used outside.*lib' stderr
+mv -f src/t src/Makefile.am
 
 ## ---------------------------------------------- ##
 ## Test using LTLIBOBJS from a sibling directory. ##
Index: tests/pr401c.test
===================================================================
RCS file: /cvs/automake/automake/tests/pr401c.test,v
retrieving revision 1.5
diff -u -r1.5 pr401c.test
--- tests/pr401c.test   14 Oct 2006 17:12:50 -0000      1.5
+++ tests/pr401c.test   17 Oct 2006 17:43:44 -0000
@@ -108,6 +108,16 @@
 test ! -d lib/lib
 $MAKE distcheck
 
+## -------------------------------------------- ##
+## Error message with usage in wrong directory. ##
+## -------------------------------------------- ##
+
+mv -f src/Makefile.am src/t
+sed 's/LDADD = .*/LDADD = @ALLOCA@/' src/t > src/Makefile.am
+AUTOMAKE_fails
+grep 'cannot be used outside.*lib' stderr
+mv -f src/t src/Makefile.am
+
 
 ## ------------------------------------------- ##
 ## Test using ALLOCA from a sibling directory. ##