From: James E Wilson <wilson@specifixinc.com>
Date: Wed, 10 Nov 2004 10:13:13 +0000 (+0000)
Subject: * config/ltmain.m4sh (func_mode_link), tests/Makefile.am,
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82e60549dea85146b28d7f096b02c609f6cc25e1;p=thirdparty%2Flibtool.git

* config/ltmain.m4sh (func_mode_link), tests/Makefile.am,
Fix error message with `-objectlist' file that does not exist.
tests/objectlist.test:  New test for this.
---

diff --git a/ChangeLog b/ChangeLog
index 32798ca2e..9c28e2902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2004-11-10  James E Wilson <wilson@specifixinc.com>,
 	    Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+	* config/ltmain.m4sh (func_mode_link), tests/Makefile.am,
+	Fix error message with `-objectlist' file that does not exist.
+	tests/objectlist.test:  New test for this.
+
 	* Makefile.am: config/ltmain.sh is generated by config/ltmain.m4sh.
 
 2004-11-09  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index 7253db80d..7f6100602 100644
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -2391,7 +2391,7 @@ func_mode_link ()
 	      fi
 	    done
 	  else
-	    func_fatal_error "link input file \`$save_arg' does not exist"
+	    func_fatal_error "link input file \`$arg' does not exist"
 	  fi
 	  arg=$save_arg
 	  prev=
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 345938741..6cc359438 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,7 +31,7 @@ F77_TESTS = \
 	f77demo-shared.test f77demo-make.test f77demo-exec.test
 
 COMMON_TESTS = \
-	link.test link-2.test nomode.test \
+	link.test link-2.test nomode.test objectlist.test \
 	quote.test sh.test suffix.test tagtrace.test \
 	cdemo-static.test cdemo-make.test cdemo-exec.test \
 	demo-static.test demo-make.test demo-exec.test \
diff --git a/tests/objectlist.test b/tests/objectlist.test
new file mode 100755
index 000000000..35325376e
--- /dev/null
+++ b/tests/objectlist.test
@@ -0,0 +1,37 @@
+#! /bin/sh
+# objectlist.test - make sure that a nonexisting objectlist file is
+# properly mentioned
+
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, a copy can be downloaded from
+# http://www.gnu.org/copyleft/gpl.html, or by writing to the Free
+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+# MA 02111-1307, USA.
+
+. ./defs || exit 1
+
+# Try a sample link command.
+linkresult=`$LIBTOOL -n --mode=link $CC -objectlist nonexistant 2>&1`
+test $? -eq 0 && exit $EXIT_FAILURE
+
+echo ".$linkresult."
+echo "$linkresult" | ${EGREP} "nonexistant" >/dev/null 2>&1 && {
+  func_msg "$progname: error message contains -objectlist argument as expected"
+  exit $EXIT_SUCCESS
+}
+
+exit $EXIT_FAILURE