PATCH: Support autoconf 2.50 in libtool.m4

[Paolo Bonzini]

This patch is an autoupdated (and manualfixed...)
version of libtool.m4 to work fine with autoconf 2.50.
It passes autoconf -W obsolete.

In particular, obsoleted macros have been updated
and backquotes are not quoted anymore in AC_MSG_xxx.
I have also used AC_MSG_NOTICE for the `creating
libtool' message

Paolo Bonzini


diff -U3 -r libtool-1.4-orig/libtool.m4 libtool-1.4/libtool.m4
--- libtool-1.4-orig/libtool.m4 Mon Jun 18 16:05:44 2001
+++ libtool-1.4/libtool.m4 Mon Jun 18 16:04:39 2001
@@ -38,7 +38,7 @@
 ])

 AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
+[AC_PREREQ(2.50)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
@@ -102,10 +102,9 @@
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
+    [AC_LANG_PUSH([C])
      AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+     AC_LANG_POP([])])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -295,16 +294,16 @@
    LIBS="$save_LIBS"
    CFLAGS="$save_CFLAGS"
  else
-   echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
+   echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD()
  fi
       else
- echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD()
       fi
     else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD()
     fi
   else
-    echo "$progname: failed program was:" >&AC_FD_CC
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD()
     cat conftest.$ac_ext >&5
   fi
   rm -f conftest* conftst*
@@ -382,7 +381,7 @@
   # used as fallback echo
   shift
   cat <<EOF
-$*
+[$]*
 EOF
   exit 0
 fi
@@ -980,10 +979,10 @@

 # Check for any special shared library compilation flags.
 if test -n "$lt_cv_prog_cc_shlib"; then
-  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared 
libraries])
+  AC_MSG_WARN([`$CC' requires `$lt_cv_prog_cc_shlib' to build shared 
libraries])
   if echo "$old_CC $old_CFLAGS " | [egrep -e "[  ]$lt_cv_prog_cc_shlib[  ]"] 
>/dev/null; then :
   else
-   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable 
and reconfigure])
+   AC_MSG_WARN([add `$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable 
and reconfigure])
     lt_cv_prog_cc_can_build_shared=no
   fi
 fi
@@ -1042,7 +1041,7 @@
   fi
 else
   # Append any errors to the config.log.
-  cat out/conftest.err 1>&AC_FD_CC
+  cat out/conftest.err 1>&AS_MESSAGE_LOG_FD()
   lt_cv_compiler_c_o=no
 fi
 CFLAGS="$save_CFLAGS"
@@ -1097,7 +1096,7 @@
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   AC_MSG_RESULT([$hard_links])
   if test "$hard_links" = no; then
-    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be 
unsafe])
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
     need_locks=warn
   fi
 else
@@ -2282,7 +2281,7 @@
   trap "$rm \"${ofile}T\"; exit 1" 1 2 15
   $rm -f "${ofile}T"

-  echo creating $ofile
+  AC_MSG_NOTICE([creating $ofile])

   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
@@ -2997,8 +2996,7 @@

 # 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)
+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)