From: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
Date: Tue, 20 Mar 2001 05:44:23 +0000 (+0000)
Subject: * configure.in (file_magic_cmd, reload_flag): Duplicate `$'s
X-Git-Tag: multi-language-merge-point~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2246c4f0170bbe6ee8f0754847f3f3d3def2b014;p=thirdparty%2Flibtool.git

* configure.in (file_magic_cmd, reload_flag): Duplicate `$'s
before SUBSTin in the Makefile.
* ltconfig.in (reload_flag): Prepend a blank if it doesn't start
with one.
---

diff --git a/ChangeLog b/ChangeLog
index d7c4ecffe..c8abbf8e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-20  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+	* configure.in (file_magic_cmd, reload_flag): Duplicate `$'s
+	before SUBSTin in the Makefile.
+	* ltconfig.in (reload_flag): Prepend a blank if it doesn't start
+	with one.
+	
 2001-03-16  Albert Chin  <china@thewrittenword.com>
 	
 	* ltcf-cxx.sh (archive_cmds) [HP-UX, GCC]: Link with -fPIC.
diff --git a/configure.in b/configure.in
index 88250c51c..177d71b22 100644
--- a/configure.in
+++ b/configure.in
@@ -86,6 +86,13 @@ done
 AC_SUBST(ACINCLUDE_M4_LIST)
 AC_SUBST(DIST_MAKEFILE_LIST)
 
+dnl Quote these variables
+for var in file_magic_cmd reload_flag; do
+  eval val=\$$var
+[ val=`echo "X$val" | sed -e '1s,^X,,' -e 's,[$],$$,g'`]
+  eval $var=\$val
+done  
+
 AC_OUTPUT_COMMANDS([
   test -f ${saved_top_srcdir}/ltconfig || ${MAKE-make} ${saved_top_srcdir}/ltconfig
   test -f ${saved_top_srcdir}/ltmain.sh || ${MAKE-make} ${saved_top_srcdir}/ltmain.sh
diff --git a/ltconfig.in b/ltconfig.in
index 80b1408f0..4d5882be7 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -950,6 +950,10 @@ else
   echo "${ac_t}no" 1>&6
 fi
 
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 test -z "$deplibs_check_method" && deplibs_check_method=unknown