Changeset 3113

Timestamp:

Nov 10, 2013, 10:47:37 AM (10 years ago)

Author:

Peter

Message:

change YAT_USE_LIBTOOL_[PUSH|POP] so it only affects the linking tests and *no longer* the compilation tests. closes #737

Location:

trunk

Files:

• m4/yat_lt_link_ifelse.m4 (modified) (3 diffs)
• test/yat_lt_compile_ifelse_test.sh (modified) (2 diffs)

trunk/m4/yat_lt_link_ifelse.m4

@@ -48 +48 @@
 # 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
+# Assign `$ac_link' to use libtool. Variable is saved so they can be
+# restored with YAT_USE_LIBTOOL_POP
 AC_DEFUN([YAT_USE_LIBTOOL_PUSH],
 [
@@ -55 +55 @@
 m4_ifdef([_YAT_USE_LIBTOOL], [],
   [LT_OUTPUT
-   yat_use_libtool_ac_compile=$ac_compile;
-   ac_compile='./libtool --mode=compile --tag=_YAT_USE_LIBTOOL_TAG '"$ac_compile";
    yat_use_libtool_ac_link=$ac_link;
    ac_link='./libtool --mode=link --tag=_YAT_USE_LIBTOOL_TAG '"$ac_link";
@@ -72 +70 @@
 m4_popdef([_YAT_USE_LIBTOOL])
 m4_ifndef([_YAT_USE_LIBTOOL], dnl
-  [ac_compile=$yat_use_libtool_ac_compile;
-   ac_link=$yat_use_libtool_ac_link;
+  [ac_link=$yat_use_libtool_ac_link;
   ])
 ]) # YAT_USE_LIBTOOL_POP

trunk/test/yat_lt_compile_ifelse_test.sh

@@ -21 +21 @@
 
 # test that YAT_USE_LIBTOOL_PUSH works with AC_COMPILE_IFELSE
+
+# This test is obsolete as YAT_USE_LIBTOOL_PUSH no longer affects
+# behaviour of AC_COMPILE_IFELSE, but we leave this test here as a
+# reminder in case we would modify YAT_USE_LIBTOOL_PUSH in the future.
 
 required="autoconf automake libtool"
@@ -50 +54 @@
 bootstrap
 ./configure $configure_opts || exit_fail
+
+# test that it works with --disable-static (see
+# http://dev.thep.lu.se/yat/ticket/737#comment:18)
+if x$enable_shared = xyes; then
+  ./configure --disable-static || exit_fail
+fi
+
 exit_success