Changeset 3728

Timestamp:

Mar 16, 2018, 5:12:53 AM (5 years ago)

Author:

Peter

Message:

New macro YAT_SEARCH_LIBS, similar to AC_SEARCH_LIBS but does not
modify variable LIBS.

Use macro in macros: YAT_LIB_CBLAS, YAT_LIB_HTS, and _YAT_CHECK_ZLIB
to simplify code.

Location:

trunk/m4

Files:

• yat_cblas.m4 (modified) (3 diffs)
• yat_check_htslib.m4 (modified) (3 diffs)
• yat_check_libbam.m4 (modified) (2 diffs)
• yat_common.m4 (modified) (3 diffs)

trunk/m4/yat_cblas.m4

@@ -2 +2 @@
 
 #
-# serial 2 (yat 0.14)
+# serial 3 (yat 0.16)
 #
 
@@ -20 +20 @@
 # COPYLEFT
 #
-#   Copyright (C) 2009, 2012, 2013, 2015 Peter Johansson
+#   Copyright (C) 2009, 2012, 2013, 2015, 2018 Peter Johansson
 #
 #   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -75 +75 @@
 # - CBLAS in SCSL library (SGI/Cray Scientific Library)
 AS_IF([test $yat_cblas_ok = no], [
-  AC_SEARCH_LIBS([cblas_sgemm],
+  YAT_SEARCH_LIBS([cblas_sgemm],
                  [tatlas satlas cblas opencblas mkl_core scs],
                  [yat_cblas_ok=yes;
-                  AS_IF([test "$ac_cv_search_cblas_sgemm" != "none required"],[
-                    CBLAS_LIB=$ac_cv_search_cblas_sgemm
-                  ])
+                  CBLAS_LIB=$yat_cv_search_cblas_sgemm
                  ])
-  LIBS=$save_LIBS
 ])
 

trunk/m4/yat_check_htslib.m4

@@ -1 +1 @@
 ## $Id$
 #
-# serial 1 (yat 0.14)
+# serial 2 (yat 0.16)
 #
-#   Copyright (C) 2016 Peter Johansson
+#   Copyright (C) 2016, 2018 Peter Johansson
 #
 #   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -61 +61 @@
 ])
 
-]) # YAT_CHECK_HTS
+]) # YAT_CHECK_HTSLIB
 
 
@@ -116 +116 @@
   AC_CHECK_HEADER([zlib.h], [],
     [AC_MSG_FAILURE([header file 'zlib.h' was not found])])
-  AC_SEARCH_LIBS([inflateEnd], [z], [],
+  YAT_SEARCH_LIBS([inflateEnd], [z],
+    [LIBZ=$yat_cv_search_inflateEnd
+     LIBS="$LIBZ $LIBS"],
     [AC_MSG_FAILURE([library 'libz' was not found])])
-  LIBZ=$ac_cv_search_inflateEnd
-  AS_IF([test x"$LIBZ" = x"none required"], [LIBZ=])
 
   YAT_CHECK_LA_LIBS([

trunk/m4/yat_check_libbam.m4

@@ -1 +1 @@
 ## $Id$
 #
-# serial 7 (yat 0.13)
-#
-#
-#   Copyright (C) 2012, 2013, 2014, 2015 Peter Johansson
+# serial 8 (yat 0.16)
+#
+#
+#   Copyright (C) 2012, 2013, 2014, 2015, 2018 Peter Johansson
 #
 #   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -49 +49 @@
 [
 BAM_LIBS=no
-AC_SEARCH_LIBS([bam_hdr_destroy], [hts],
-               [AS_IF([test "$ac_cv_search_bam_hdr_destroy" != "none required"],
-                      [BAM_LIBS=$ac_cv_search_bam_hdr_destroy])
+YAT_SEARCH_LIBS([bam_hdr_destroy], [hts],
+               [BAM_LIBS=$yat_cv_search_bam_hdr_destroy
                 $1],
                [$2])

trunk/m4/yat_common.m4

@@ -1 +1 @@
 ## $Id$
 #
-# Copyright (C) 2009, 2010, 2012, 2013, 2014 Peter Johansson
+# Copyright (C) 2009, 2010, 2012, 2013, 2014, 2018 Peter Johansson
 #
 # This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -22 +22 @@
 # This file contains some small useful macros.
 #
-# serial 3 (yat 0.11)
+# serial 4 (yat 0.16)
 #
 
@@ -92 +92 @@
 LIBS=$save_LIBS
 ])
+
+# YAT_SEARCH_LIBS(function, libraries, [action-if-found],
+#                 [action-if-not-found], [other-libraries])
+# =================================================================
+# Same as AC_SEARCH_LIBS, but do not append LIBS with found library
+# (if-found). Found library is stored in $yat_cv_search_<function>, set
+# to empty string if no library required, and set to no if no library
+# found.
+AC_DEFUN([YAT_SEARCH_LIBS],
+[
+AS_VAR_PUSHDEF([yat_Search], [yat_cv_search_$1])
+dnl cache variable used in autoconf code (AC_SEARCH_LIBS)
+AS_VAR_PUSHDEF([yat_ac_Search], [ac_cv_search_$1])
+yat_func_search_save_LIBS=$LIBS
+
+AC_SEARCH_LIBS([$1], [$2], [
+    LIBS=$yat_func_search_save_LIBS
+    AS_VAR_IF([yat_ac_Search], ["none required"], [], [
+      AS_VAR_COPY([yat_Search], [yat_ac_Search])
+    ])
+    $3
+  ], [
+    AS_VAR_COPY([yat_ac_Search], [yat_Search])
+    $4
+  ], [$5])
+
+AS_VAR_POPDEF([yat_ac_Search])
+AS_VAR_POPDEF([yat_Search])
+]) # YAT_SEARCH_LIBS