Changeset 2394

Timestamp:

Jan 7, 2011, 12:29:37 AM (12 years ago)

Author:

Peter

Message:

use m4_popdef and m4_pushdef rather than define and undefine. Fix typo in test and call YAT_USE_LIBTOOL_PUSH before calling YAT_LT_LINK_IFELSE as that is the prefered way.

Location:

trunk

Files:

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

trunk/m4/yat_lt_link_ifelse.m4

@@ -32 +32 @@
 
 #
-# serial 2 
+# serial 3 
 #
 
@@ -53 +53 @@
 m4_defn([LT_INIT])
 m4_ifdef([_YAT_USE_LIBTOOL], [],
-  [m4_define([_YAT_USE_LIBTOOL], [yes])
-   LT_OUTPUT
+  [LT_OUTPUT
    yat_use_libtool_ac_compile=$ac_compile;
    ac_compile="./libtool --mode=compile --tag=_YAT_USE_LIBTOOL_TAG $ac_link";
@@ -60 +59 @@
    ac_link="./libtool --mode=link --tag=_YAT_USE_LIBTOOL_TAG $ac_link";
   ]) dnl
+m4_pushdef([_YAT_USE_LIBTOOL], [yes])
 ]) # YAT_USE_LIBTOOL_PUSH
 
@@ -69 +69 @@
 AC_DEFUN([YAT_USE_LIBTOOL_POP],
 [
-m4_ifdef([_YAT_USE_LIBTOOL], dnl
-  [m4_undefine([_YAT_USE_LIBTOOL])
-   ac_compile=$yat_use_libtool_ac_compile;
+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;
   ])

trunk/test/yat_lt_link_ifelse_test.sh

@@ -30 +30 @@
 
 cat >> configure.ac <<EOF
+YAT_USE_LIBTOOL_PUSH
 AC_MSG_CHECKING([libtool linking])
 YAT_LT_LINK_IFELSE([AC_LANG_PROGRAM],
@@ -60 +61 @@
                    [test_result=ok; AC_SUBST(test_result)],
                    [AC_MSG_ERROR([cannot libtool link yat])])
-AC_MSG_CHECKING([ok])
+AC_MSG_RESULT([ok])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT