Changeset 2376

Timestamp:

Dec 20, 2010, 2:17:21 AM (12 years ago)

Author:

Peter

Message:

closes #496

Location:

trunk

Files:

• m4/yat_lt_link_ifelse.m4 (modified) (4 diffs)
• test/yat_lt_link_ifelse_test.sh (modified) (3 diffs)

trunk/m4/yat_lt_link_ifelse.m4

@@ -32 +32 @@
 
 #
-# serial 1 
+# serial 2 
 #
 
+# YAT_LT_LINK_IFELSE(PROG, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# -------------------------------------------------------------
+# Same as AC_LINK_IFELSE but linking via libtool
 AC_DEFUN([YAT_LT_LINK_IFELSE],
 [
@@ -42 +45 @@
 ]) # YAT_LT_LINK_IFELSE
 
+# YAT_USE_LIBTOOL_PUSH
+# --------------------
+# Assign `$ac_link' and `$ac_compile' to use libtool. Variables are
+# saved so they can be restored with YAT_USE_LIBTOOL_POP
 AC_DEFUN([YAT_USE_LIBTOOL_PUSH],
 [
 m4_defn([LT_INIT])
-m4_ifdef([_YAT_USE_LIBTOOL],,
+m4_ifdef([_YAT_USE_LIBTOOL], [],
   [m4_define([_YAT_USE_LIBTOOL], [yes])
    LT_OUTPUT
@@ -51 +58 @@
    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
+   ac_link="./libtool --mode=link --tag=_YAT_USE_LIBTOOL_TAG $ac_link";
   ]) dnl
 ]) # YAT_USE_LIBTOOL_PUSH
 
+# YAT_USE_LIBTOOL_POP
+# --------------------
+
+# Restore values of `$ac_link' and `$ac_compile' to what they were
+# prior YAT_USE_LIBTOOL_PUSH
 AC_DEFUN([YAT_USE_LIBTOOL_POP],
 [
@@ -64 +76 @@
 ]) # YAT_USE_LIBTOOL_POP
 
+
+# _YAT_USE_LIBTOOL_TAG
+# --------------------
+# internal macro to select tag depending on active library
 m4_define([_YAT_USE_LIBTOOL_TAG],
-[AC_LANG_CASE([C], [CC],
-              [C++], [CXX],
-              [Fortran 77], [F77],
-              [Fortran], [FC])
+[AC_LANG_CASE([C], [CC], dnl
+              [C++], [CXX], dnl
+              [Fortran 77], [F77], dnl
+              [Fortran], [FC]) dnl
 ])

trunk/test/yat_lt_link_ifelse_test.sh

@@ -30 +30 @@
 
 cat >> configure.ac <<EOF
+AC_MSG_CHECKING([libtool linking])
+YAT_LT_LINK_IFELSE([AC_LANG_PROGRAM],
+                   [],
+                   [AC_MSG_ERROR([cannot libtool link simple program])])
+AC_MSG_RESULT([ok])
+
+AC_MSG_CHECKING([libtool linking against -lrapakalja])
+LIBS=-lrapakalja
+YAT_LT_LINK_IFELSE([AC_LANG_PROGRAM],
+                   [AC_MSG_ERROR([unexpectedly succesful linking with $LIBS])])
+AC_MSG_RESULT([no (as expected)])
+
 YAT_FIND_YAT
 m4_define([PROG], 
@@ -43 +55 @@
                            ])
            ])
-LIBS=-lrapakalja
-YAT_LT_LINK_IFELSE([PROG],
-                   [AC_MSG_ERROR([unexpectedly succesful linking with $LIBS])])
+AC_MSG_CHECKING([libtool linking against -lyat])
 LIBS=\`\$yat_config --link-libtool\`;
 YAT_LT_LINK_IFELSE([PROG],
                    [test_result=ok; AC_SUBST(test_result)],
                    [AC_MSG_ERROR([cannot libtool link yat])])
+AC_MSG_CHECKING([ok])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
@@ -59 +70 @@
     echo OK;
 else
-    tail -n 30 config.log;
+    tail -n 500 config.log;
     exit 1;
 fi