Changeset 2346

Timestamp:

Oct 22, 2010, 12:23:33 AM (12 years ago)

Author:

Peter

Message:

refs #496. re-writing YAT_LT_LINK_IFELSE based on suggestion from Peter Breitenlohner

File:

• trunk/m4/yat_lt_link_ifelse.m4 (modified) (1 diff)

trunk/m4/yat_lt_link_ifelse.m4

@@ -27 +27 @@
 #
 
+# Based on _KPSE_USE_LIBTOOL by 
+# Peter Breitenlohner <peb@mppmu.mpg.de> shared here
+# http://www.mail-archive.com/autoconf@gnu.org/msg19948.html
+
 #
-# serial 0  
+# serial 1 
 #
 
 AC_DEFUN([YAT_LT_LINK_IFELSE],
 [
-  # currently we assume that language is C++
-  AC_LANG_ASSERT([C++])
-  AC_REQUIRE([AC_PROG_LIBTOOL])
-  ac_yat_lt_link_ifelse=yes
-  LT_OUTPUT
-  AC_LANG_CONFTEST([$1])
-
-  rm -f conftest.lo
-  YAT_RUN_LOG([$SHELL libtool --tag=CXX --mode=compile $CXX $CXXFLAGS $CPPFLAGS -c -o conftest.lo conftest.$ac_ext], [], [ac_yat_lt_link_ifelse=no])
-
-  rm -f conftest
-  YAT_RUN_LOG([$SHELL libtool --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o conftest conftest.lo $LIBS], [], [ac_yat_lt_link_ifelse=no])
-
-  AS_IF([test x$ac_yat_lt_link_ifelse = xyes], [$2], [$3]) 
+  YAT_USE_LIBTOOL_PUSH
+  AC_LINK_IFELSE($@)
+  YAT_USE_LIBTOOL_POP
 ]) # YAT_LT_LINK_IFELSE
 
+AC_DEFUN([YAT_USE_LIBTOOL_PUSH],
+[
+m4_defn([LT_INIT])
+m4_ifdef([_YAT_USE_LIBTOOL],,
+  [m4_define([_YAT_USE_LIBTOOL], [yes])
+   LT_OUTPUT
+   yat_use_libtool_ac_compile=$ac_compile;
+   ac_compile="./libtool --mode=compile --tag=_YAT_USE_LIBTOOL_TAG $ac_link";
+   yat_use_libtool_ac_link=$ac_link;
+   ac_link="./libtool --mode=link --tag=CXX $ac_link"; dnl
+  ]) dnl
+]) # YAT_USE_LIBTOOL_PUSH
 
+AC_DEFUN([YAT_USE_LIBTOOL_POP],
+[
+m4_ifdef([_YAT_USE_LIBTOOL], dnl
+  [m4_undefine([_YAT_USE_LIBTOOL])
+   ac_compile=$yat_use_libtool_ac_compile;
+   ac_link=$yat_use_libtool_ac_link;
+  ])
+]) # YAT_USE_LIBTOOL_POP
 
+m4_define([_YAT_USE_LIBTOOL_TAG],
+[AC_LANG_CASE([C], [CC],
+              [C++], [CXX],
+              [Fortran 77], [F77],
+              [Fortran], [FC])
+])