From eb5b3d15a33d4f7671edbd6100c31fdd504a60c2 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 28 Sep 2010 18:34:17 +0200
Subject: Use libtool only to link

---
 m4/libtool-link.m4 | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'm4/libtool-link.m4')

diff --git a/m4/libtool-link.m4 b/m4/libtool-link.m4
index 229b270..d73c508 100644
--- a/m4/libtool-link.m4
+++ b/m4/libtool-link.m4
@@ -11,8 +11,6 @@ dnl linking and it does this using the C++ compiler.
 dnl
 AC_DEFUN([CXX_LIBTOOL_LINK_IFELSE],[
 AC_LANG_SAVE
-save_CXX="$CXX"
-CXX="./libtool --tag=CXX --mode=link $CXX -no-install"
 AC_LANG(C++)
 
 if test -d .libs; then
@@ -21,11 +19,29 @@ else
   delete_libs_dir=yes
 fi
 
-AC_LINK_IFELSE([$1], [$2], [$3])
+AC_COMPILE_IFELSE([$1],
+[
+  ac_try='./libtool --tag=CXX --mode=link $CXX -no-install $CXXFLAGS $LDFLAGS -o conftest conftest.$OBJEXT $LIBS >&AS_MESSAGE_LOG_FD'
+  if _AC_DO_VAR(ac_try); then
+    libtool_link_ok=yes
+  else
+    libtool_link_ok=no
+  fi
+],
+[
+  libtool_link_ok=no
+])
 
-if test x"$delete_libs_dir" != xyes; then
+if test x"$delete_libs_dir" = xyes; then
   rm -rf .libs
 fi
 
-CXX="$save_CXX"
+if test x"$libtool_link_ok" = xyes; then
+[$2]
+:
+else
+[$3]
+:
+fi
+
 AC_LANG_RESTORE])dnl
-- 
cgit v1.1