Changeset 3588

Timestamp:

Jan 19, 2017, 3:02:04 PM (7 years ago)

Author:

Peter

Message:

refs #878

Modify macro YAT_CHECK_HEADER so it adds -DYAT_WITHOUT_CXX11 if
needed. It first tries compiling against yat/utility/Vector.h; it it
fails, it retries with -DYAT_WITHOUT_CXX11. If that works, it means
yat was built with c++11 support but the current compiler does not
support, so we turn it off by adding -DYAT_WITHOUT_CXX11 to
$YAT_CPPFLAGS.

Fixing two tests.

Location:

trunk

Files:

• m4/yat.m4 (modified) (3 diffs)
• test/yat_m4_with_bam_test.sh (modified) (1 diff)
• test/yat_pc_test.sh (modified) (1 diff)

trunk/m4/yat.m4

@@ -1 +1 @@
 ## $Id$
 #
-# serial 9  (yat 0.11)
+# serial 10  (yat 0.15)
 #
 # see http://www.gnu.org/software/automake/manual/automake.html#Serials
@@ -216 +216 @@
     AC_LANG_ASSERT([C++])
     # checking for Vector, which uses both GSL and Boost
-    AC_CHECK_HEADER([yat/utility/Vector.h],
-                    [ac_yat_ok="yes"],
-                    [ac_yat_ok="no"])
+    AC_MSG_CHECKING([for yat/utility/Vector.h])
+    _YAT_CHECK_HEADER([yat/utility/Vector.h], [
+      AC_MSG_RESULT([yes])
+      ac_yat_ok="yes"
+    ], [
+      AC_MSG_RESULT([no])
+      AC_MSG_CHECKING([for yat/utility/Vector.h with -DYAT_WITHOUT_CXX11])
+      CPPFLAGS="$CPPFLAGS -DYAT_WITHOUT_CXX11"
+      _YAT_CHECK_HEADER([yat/utility/Vector.h], [
+        YAT_CPPFLAGS="$YAT_CPPFLAGS -DYAT_WITHOUT_CXX11"
+        ac_yat_ok="yes"
+        AC_MSG_RESULT([yes])
+      ], [
+        ac_yat_ok="no"
+        AC_MSG_RESULT([no])
+      ])
+    ])
 
     # checking that version in yat-config and version.h agree
@@ -364 +378 @@
 
 
+# _YAT_CHECK_HEADER(header, [ACTION-IF_FOUND], [ACTION-IF-NOT-FOUND])
+#
+AC_DEFUN([_YAT_CHECK_HEADER],
+[
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <$1>], [])],
+                      [$2], [$3])
+])
+
+
 # _YAT_CHECK_LIB_YAT([ACTION-IF_FOUND], [ACTION-IF-NOT-FOUND])
 #

trunk/test/yat_m4_with_bam_test.sh

@@ -27 +27 @@
 cat >> configure.ac <<EOF
 YAT_CHECK_HEADER([], [AC_MSG_ERROR])
+CPPFLAGS="\$YAT_CPPFLAGS"
 LDFLAGS="\$LDFLAGS \`\$yat_config --ldflags\`"
 LIBS="\$LIBS \`\$yat_config --link-libtool\`"

trunk/test/yat_pc_test.sh

@@ -57 +57 @@
 }
 
+PATH="$abs_top_builddir/build_support:$PATH"
+export PATH
 
 # add PATH so pkg-config find yat.pc in build tree first