* 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.

diff --git a/ChangeLog b/ChangeLog
index d9da625..aab25c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-29  Stepan Kasal  <kasal@ucw.cz>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * 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.
+
 2007-03-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * automake.in (scan_autoconf_config_files): Warn about leading

diff --git a/automake.in b/automake.in
index 8d1fc79..1f8bcef 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2209,11 +2209,10 @@ sub handle_LIBOBJS_or_ALLOCA ($)
          # 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");
        }
     }

diff --git a/tests/pr401.test b/tests/pr401.test
index 238b8bc..1e18e7c 100755 (executable)
--- a/tests/pr401.test
+++ b/tests/pr401.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -88,7 +88,6 @@ $AUTOMAKE
 ./configure
 $MAKE distcheck
 
-
 ## ------------------------------------------ ##
 ## Traditional LIBOBJS with LIBOBJDIR set.    ##
 ## ------------------------------------------ ##
@@ -106,6 +105,16 @@ $AUTOMAKE
 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. ##

diff --git a/tests/pr401b.test b/tests/pr401b.test
index 45a19bf..14cfe43 100755 (executable)
--- a/tests/pr401b.test
+++ b/tests/pr401b.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -107,6 +107,15 @@ $AUTOMAKE -a
 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. ##

diff --git a/tests/pr401c.test b/tests/pr401c.test
index 0cf0869..c05cb48 100755 (executable)
--- a/tests/pr401c.test
+++ b/tests/pr401c.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -108,6 +108,16 @@ $AUTOMAKE
 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. ##