From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 30 Sep 2005 08:41:48 +0000 (+0000)
Subject: * libltdl/config/ltmain.m4sh (func_mode_link):
X-Git-Tag: release-2-1b~484
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24bb783732a21d18e9ead018279437f80180dd59;p=thirdparty%2Flibtool.git

* libltdl/config/ltmain.m4sh (func_mode_link):
Fix wrong logic introduced in last commit.
---

diff --git a/ChangeLog b/ChangeLog
index 06299d01b..1f4d28b4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* libltdl/config/ltmain.m4sh (func_mode_link):
+	Fix wrong logic introduced in last commit.
+
 2005-09-30  Gary V. Vaughan  <gary@gnu.org>
 
 	* tests/libtoolize.at: Add a new test to catch a regression I
@@ -23,7 +28,7 @@
 	and also remove temporary files used during symbols file
 	filtering.
 
-2005-09-29  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+2005-09-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* libtoolize.m4sh (func_included_files): Do not recurse
 	non-existent files.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 1ac571990..cc63b20d9 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -4933,7 +4933,7 @@ EOF
 	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 
 	delfiles=
-	if test -n "$export_symbols$include_expsyms"; then
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
 	  export_symbols="$output_objdir/$libname.uexp"
 	  delfiles="$delfiles $export_symbols"
@@ -4991,7 +4991,7 @@ EOF
 	  fi
 	fi
 
-	if test -n "$export_symbols$include_expsyms"; then
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  tmp_export_symbols="$export_symbols"
 	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
 	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'