From 4f34ae7cd11ae0796076a271e33aa09fae7f12a3 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 18 Dec 2000 01:04:24 +0000 Subject: [PATCH] * automake.in (handle_ltlibraries): Check for LDFLAGS variables before using values. --- ChangeLog | 3 +++ automake.in | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e397310..8baf82e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-12-17 Tom Tromey + * 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 07f53ea..14064c3 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"; -- 2.7.4