Changeset 2693

Timestamp:

Feb 28, 2012, 12:51:40 PM (12 years ago)

Author:

Peter

Message:

cache YAT_CHECK_LIB. refs #696

File:

• trunk/m4/yat.m4 (modified) (3 diffs)

trunk/m4/yat.m4

@@ -273 +273 @@
     LIBS="$LIBS $YAT_LIBS"
     AC_LANG_ASSERT([C++])
-    AC_MSG_CHECKING([for utility::version(void) in yat])
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <string>
-                                      namespace theplu{
-                                      namespace yat{
-                                      namespace utility {
-                                      std::string version(void);
-                                      }}}
-                                    ]],
-                                    [using namespace theplu::yat::utility;
-                                     std::string s=version();])],
-                   [ac_yat_ok="yes";
-                    AC_MSG_RESULT([yes])
+    AC_CACHE_CHECK([for utility::version(void) in yat],
+                   [yat_cv_lib_yat],
+                   [_YAT_CHECK_LIB_YAT([yat_cv_lib_yat=yes],
+                                       [yat_cv_lib_yat=no])])
+
+    AS_IF([test x$yat_cv_lib_yat = xyes], [
+                    ac_yat_ok="yes";
                     AC_SUBST(YAT_LDFLAGS)
                     AC_SUBST(YAT_LIBS)
@@ -309 +304 @@
 ]) # YAT_CHECK_LIB
 
-# Private macro
+# Private macros
 #
 # if yat_ac_want_yat = no do nothing
@@ -320 +315 @@
         [m4_default([$3], [:])])
 ])
+
+
+# _YAT_CHECH_LIB_YAT([ACTION-IF_FOUND], [ACTION-IF-NOT-FOUND])
+#
+AC_DEFUN([_YAT_CHECK_LIB_YAT],
+[
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <string>
+                                      namespace theplu{
+                                      namespace yat{
+                                      namespace utility {
+                                      std::string version(void);
+                                      }}}
+                                    ]],
+                                    [using namespace theplu::yat::utility;
+                                     std::string s=version();])],
+                   [$1], [$2])
+])