* m4/libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER): Make this an m4_defun,

test the tags compiler to see if it is GCC, not the CC compiler.

diff --git a/ChangeLog b/ChangeLog
index d094ba271e4c6c4e9c88cb12a27cd0278cd5439d..9653a906fcdc864073edad8a515ed83bfe1d352c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-18  Peter O'Gorman  <peter@pogma.com>
+
+       * m4/libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER): Make this an m4_defun,
+       test the tags compiler to see if it is GCC, not the CC compiler.
+
 2004-05-16  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * doc/libtool.texi (Invoking libtool): Mention --tag=TAG.

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index d154ae3b9b3e2bc7e41604af42dd039d81b0a333..0228f69c80fc455a004c0f0184bf3a046145ccdc 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1558,9 +1558,14 @@ _LT_DECL([], [striplib], [1])
 # AC_LIBTOOL_SYS_DYNAMIC_LINKER
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+m4_defun([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
 [AC_REQUIRE([LT_AC_PROG_EGREP])
 AC_MSG_CHECKING([dynamic linker characteristics])
+m4_case([$1],
+       [C], [withGCC=$GCC],
+       [CXX], [withGCC=$GXX],
+       [F77], [withGCC=$G77],
+       [withGCC=$GCC])
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -1574,7 +1579,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
+if test "$withGCC" = yes; then
   sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
   if echo "$sys_lib_search_path_spec" | $GREP ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
@@ -1685,7 +1690,7 @@ cygwin* | mingw* | pw32*)
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
+  case $withGCC,$host_os in
   yes,cygwin* | yes,mingw* | yes,pw32*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
@@ -1748,7 +1753,7 @@ darwin* | rhapsody*)
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
+  if test "$withGCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | $GREP "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
   else
     sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'