From: Alexandre Oliva <aoliva@redhat.com>
Date: Sat, 30 Sep 2000 05:21:27 +0000 (+0000)
Subject: * libtool.m4 (lt_cv_file_magic_cmd): Don't use '${MAGIC_CMD}' or
X-Git-Tag: multi-language-merge-point~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a4bbcbbb5a13846f825281ea515de4eb9a67809;p=thirdparty%2Flibtool.git

* libtool.m4 (lt_cv_file_magic_cmd): Don't use '${MAGIC_CMD}' or
'${OBJDUMP}'; Solaris' /bin/sh loses with `}' in cache files.
(ac_cv_path_MAGIC_CMD): Renamed to lt_cv_path_MAGIC_CMD.
---

diff --git a/ChangeLog b/ChangeLog
index 64383716d..c18acfcef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-30  Alexandre Oliva  <aoliva@redhat.com>
+
+	* libtool.m4 (lt_cv_file_magic_cmd): Don't use '${MAGIC_CMD}' or
+	'${OBJDUMP}'; Solaris' /bin/sh loses with `}' in cache files.
+	(ac_cv_path_MAGIC_CMD): Renamed to lt_cv_path_MAGIC_CMD.
+
 2000-09-28  Gary V. Vaughan  <gvv@techie.com>
 
 	* libtool.m4 (MAGIC_CMD): Don't use MAGIC, since BSD versions of
diff --git a/libtool.m4 b/libtool.m4
index f5405d5b7..d73278965 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -104,7 +104,7 @@ dnl
 # Only perform the check for file, if the check method requires it
 case "$deplibs_check_method" in
 file_magic*)
-  if test "$file_magic_cmd" = '${MAGIC_CMD}'; then
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     AC_PATH_MAGIC
   fi
   ;;
@@ -328,7 +328,7 @@ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
   ;;
   ?:/*)
-  ac_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
   ;;
   *)
   ac_save_MAGIC_CMD="$MAGIC_CMD"
@@ -497,7 +497,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag"
 AC_DEFUN(AC_DEPLIBS_CHECK_METHOD,
 [AC_CACHE_CHECK([how to recognise dependant libraries],
 lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='${MAGIC_CMD}'
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
 # Need to set the preceding variable on all platforms that support
@@ -530,7 +530,7 @@ bsdi4*)
 
 cygwin* | mingw* |pw32*)
   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='${OBJDUMP} -f'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
 
 freebsd* )