From: Christian Cornelssen <ccorn@cs.tu-berlin.de>
Date: Wed, 5 Feb 2003 07:03:55 +0000 (+0000)
Subject: * libtool.m4 (_LT_AC_LANG_CXX_CONFIG)
X-Git-Tag: release-1-5~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=306c939a38d55b863e1f5c0d788ccc7c9373dd29;p=thirdparty%2Flibtool.git

* libtool.m4 (_LT_AC_LANG_CXX_CONFIG)
(AC_LIBTOOL_PROG_LD_SHLIBS): Rewrite printf commands so
that the format string cannot be mistaken as an option.
Reported by Martin MOKREJS.
---

diff --git a/ChangeLog b/ChangeLog
index e3cc606a5..1d6ce74a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-05  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+	* libtool.m4 (_LT_AC_LANG_CXX_CONFIG)
+	(AC_LIBTOOL_PROG_LD_SHLIBS): Rewrite printf commands so
+	that the format string cannot be mistaken as an option.
+	Reported by Martin MOKREJS.
+
 2003-02-05  Robert Boehne  <rboehne@gnu.org>
 
 	* libtool.m4: Modify the sys_lib_search_path_spec to allow
diff --git a/libtool.m4 b/libtool.m4
index e7c92752d..632e35fc4 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -3125,7 +3125,7 @@ case $host_os in
       cxx)
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done~
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	  echo "-hidden">> $lib.exp~
 	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
 	  $rm $lib.exp'
@@ -5355,7 +5355,7 @@ EOF
       else
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
 	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly