* configure.in: Due to a bug in autoconf-2.13 implementation of

AC_SUBST, `AC_SUBST(FILE)' can never work.  Use MAGIC as the
holder of the command to run in file_magic_cmd instead.
* ltconfig.in: s/FILE/MAGIC/g.
* libtool.m4 (AC_PROG_LIBTOOL): set MAGIC in the environment when
calling ltconfig.
(AC_PATH_MAGIC):  renamed from AC_PATH_FILE.
(AC_PATH_TOOL_PREFIX):  s/FILE/MAGIC/g.  Also set file_magic_cmd
to '${MAGIC}' so that make can grok it.
* Makefile.am (libtool):
(clibtool): ditto.

diff --git a/ChangeLog b/ChangeLog
index 387b06bfbe0a29d1d94406a1e57578b5770ad8da..87f8eed876f78f9bee47a8481dcffece9ba6efee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2000-02-23  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+
+       * configure.in: Due to a bug in autoconf-2.13 implementation of
+       AC_SUBST, `AC_SUBST(FILE)' can never work.  Use MAGIC as the
+       holder of the command to run in file_magic_cmd instead.
+       * ltconfig.in: s/FILE/MAGIC/g.
+       * libtool.m4 (AC_PROG_LIBTOOL): set MAGIC in the environment when
+       calling ltconfig.
+       (AC_PATH_MAGIC):  renamed from AC_PATH_FILE.
+       (AC_PATH_TOOL_PREFIX):  s/FILE/MAGIC/g.  Also set file_magic_cmd
+       to '${MAGIC}' so that make can grok it.
+       * Makefile.am (libtool):
+       (clibtool): ditto.
+       
 2000-02-21  Gary V. Vaughan  <gary@oranda.demon.co.uk>
 
        * libltdl/ltdl.c (lt_find_dlhandle): New function.

diff --git a/Makefile.am b/Makefile.am
index 7749527f6fabdab8ae67ef3fbe2b7ed8883400a5..7b5dc8ababd307ba9269acf26a96b35df1b95905 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ bin_SCRIPTS = libtool libtoolize
 
 libtool: $(srcdir)/ltmain.sh $(srcdir)/ltconfig
        AR="$(AR)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
-       FILE="$(FILE)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
+       MAGIC="$(MAGIC)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
        LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
        AS="$(AS)" DLLTOOL="$(DLLTOOL)" OBJDUMP="$(OBJDUMP)" \
        objext="$(OBJEXT)" exeext="$(EXEEXT)" reload_flag="$(reload_flag)" \
@@ -41,7 +41,7 @@ libtool: $(srcdir)/ltmain.sh $(srcdir)/ltconfig
 # Experimental C version of libtool.
 clibtool: $(srcdir)/ltmain.c $(srcdir)/ltconfig
        AR="$(AR)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
-       FILE="$(FILE)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
+       MAGIC="$(MAGIC)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
        LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
        AS="$(AS)" DLLTOOL="$(DLLTOOL)" OBJDUMP="$(OBJDUMP)" \
        objext="$(objext)" exeext="$(exeext)" reload_flag="$(reload_flag)" \

diff --git a/configure.in b/configure.in
index b167232712d9b5d5c1085c78687d2094b67e579c..e8b922d5f80c8f57f6ba7b8d91734e358247aecb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -49,7 +49,7 @@ dnl Check for dlopen support
 AC_LIBTOOL_DLOPEN
 AC_LIBTOOL_SETUP
 AC_SUBST(DLLTOOL)
-AC_SUBST(FILE)
+AC_SUBST(MAGIC)
 AC_SUBST(OBJDUMP)
 AC_SUBST(AS)
 AC_SUBST(reload_flag)

diff --git a/libtool.m4 b/libtool.m4
index 1f3559e2f04dd30558bed8f52209beb2321c11e9..ab7514f674ec29e0e5e2e8ba0e19d3ae7a589b36 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -30,7 +30,7 @@ AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
 AR="$AR" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-FILE="$FILE" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
 AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
 objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
@@ -74,8 +74,8 @@ 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" = '$FILE'; then
-    AC_PATH_FILE
+  if test "$file_magic_cmd" = '${MAGIC}'; then
+    AC_PATH_MAGIC
   fi
   ;;
 esac
@@ -290,16 +290,16 @@ AC_ENABLE_FAST_INSTALL(no)])
 # AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
 AC_DEFUN(AC_PATH_TOOL_PREFIX,
 [AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_FILE,
-[case "$FILE" in
+AC_CACHE_VAL(lt_cv_path_MAGIC,
+[case "$MAGIC" in
   /*)
-  lt_cv_path_FILE="$FILE" # Let the user override the test with a path.
+  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
   ;;
   ?:/*)
-  ac_cv_path_FILE="$FILE" # Let the user override the test with a dos path.
+  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
   ;;
   *)
-  ac_save_file="$FILE"
+  ac_save_MAGIC="$MAGIC"
   IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
 dnl $ac_dummy forces splitting on constant user-supplied paths.
 dnl POSIX.2 word splitting is done only on the output of word expansions,
@@ -308,12 +308,12 @@ dnl not every word.  This closes a longstanding sh security hole.
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$1; then
-      lt_cv_path_FILE="$ac_dir/$1"
+      lt_cv_path_MAGIC="$ac_dir/$1"
       if test -n "$file_magic_test_file"; then
        case "$deplibs_check_method" in
        "file_magic "*)
          file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-         FILE="$lt_cv_path_FILE"
+         MAGIC="$lt_cv_path_MAGIC"
          if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
            egrep "$file_magic_regex" > /dev/null; then
            :
@@ -337,27 +337,27 @@ EOF
     fi
   done
   IFS="$ac_save_ifs"
-  FILE="$ac_save_file"
+  MAGIC="$ac_save_MAGIC"
   ;;
 esac])
-FILE="$lt_cv_path_FILE"
-if test -n "$FILE"; then
-  AC_MSG_RESULT($FILE)
+MAGIC="$lt_cv_path_MAGIC"
+if test -n "$MAGIC"; then
+  AC_MSG_RESULT($MAGIC)
 else
   AC_MSG_RESULT(no)
 fi
 ])
 
 
-# AC_PATH_FILE - find a file program which can recognise a shared library
-AC_DEFUN(AC_PATH_FILE,
+# AC_PATH_MAGIC - find a file program which can recognise a shared library
+AC_DEFUN(AC_PATH_MAGIC,
 [AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
 AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_FILE"; then
+if test -z "$lt_cv_path_MAGIC"; then
   if test -n "$ac_tool_prefix"; then
     AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
   else
-    FILE=:
+    MAGIC=:
   fi
 fi
 ])
@@ -465,7 +465,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='$FILE'
+[lt_cv_file_magic_cmd='${MAGIC}'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
 # Need to set the preceding variable on all platforms that support

diff --git a/ltconfig.in b/ltconfig.in
index a34067df8f5945c2062cee086db79cf2aa2aa0d7..2272d9cd647aca6e94ef5213546248a95485baae 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -524,7 +524,7 @@ test -z "$AR" && AR=ar
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$FILE" && FILE=file
+test -z "$MAGIC" && MAGIC=file
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
 test -z "$NM" && NM=nm