From: Tom Tromey <tromey@redhat.com>
Date: Mon, 18 Dec 2000 01:04:24 +0000 (+0000)
Subject: 	* automake.in (handle_ltlibraries): Check for LDFLAGS variables
X-Git-Tag: Release-1-4b~17
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=42502c9ac16a1c5bd7dbf59d7a1286ea1be24fde;p=automake.git

	* automake.in (handle_ltlibraries): Check for LDFLAGS variables
	before using values.
---

diff --git a/ChangeLog b/ChangeLog
index e397310f..8baf82e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-17  Tom Tromey  <tromey@redhat.com>
 
+	* automake.in (handle_ltlibraries): Check for LDFLAGS variables
+	before using values.
+
 	* automake.in (handle_ltlibraries): Allow _LDFLAGS to be
 	conditionally defined.  Fixes PR automake/77 and ldflags.test.
 
diff --git a/automake.in b/automake.in
index 07f53eac..14064c39 100755
--- a/automake.in
+++ b/automake.in
@@ -2011,9 +2011,12 @@ sub handle_ltlibraries
 
 	# Check that the library fits the standard naming convention.
     	$libname_rx = "^lib.*\.la";
-	if (grep (/-module/, &variable_value_as_list ($xlib . '_LDFLAGS',
-						      'all'))
-	    || grep (/-module/, &variable_value_as_list ('LDFLAGS', 'all')))
+	if ((&variable_defined ($xlib . '_LDFLAGS')
+	     && grep (/-module/, &variable_value_as_list ($xlib . '_LDFLAGS',
+							  'all')))
+	    || (&variable_defined ('LDFLAGS')
+		&& grep (/-module/, &variable_value_as_list ('LDFLAGS',
+							     'all'))))
 	{
 		# Relax name checking for libtool modules.
 	    	$libname_rx = "\.la";