Changeset 3890

Timestamp:

Mar 26, 2020, 2:40:56 AM (4 years ago)

Author:

Peter

Message:

Both HAVE_HTSLIB and have_htslib we AC_SUBST'd with different output,
which was confusing. Remove the HAVE_HTSLIB. Also prefer using shell
${variable} rather than @variable@ subsituted by 'config.status'.

Location:

trunk

Files:

• m4/yat_check_htslib.m4 (modified) (3 diffs)
• test/defs.sh.in (modified) (5 diffs)

trunk/m4/yat_check_htslib.m4

@@ -1 +1 @@
 ## $Id$
 #
-# serial 6 (yat 0.18)
+# serial 7 (yat 0.18)
 #
 #   Copyright (C) 2016, 2018, 2020 Peter Johansson
@@ -51 +51 @@
 # propagate some results to 'Makefile' and 'config.h'
 AM_CONDITIONAL([HAVE_HTSLIB], [test x"$with_htslib" = x"yes"])
-have_htslib=$with_htslib
-AC_SUBST([have_htslib])
+AC_SUBST([have_htslib], [$with_htslib])
 AM_CONDITIONAL([HAVE_SAMTOOLS_EXECUTABLE], [test x"$SAMTOOLS" != x"false"])
 AC_SUBST([SAMTOOLS])
@@ -125 +124 @@
     AC_MSG_FAILURE([htslib was not found])
   ])
-  AC_SUBST([HAVE_HTSLIB], [$have_hts])
 
   YAT_CHECK_LA_LIBS([

trunk/test/defs.sh.in

@@ -79 +79 @@
       ;;
       doxygen)
-      test @have_doxygen@ = "yes" || exit_skip no doxygen
+      test x"${have_doxygen}" = x"yes" || exit_skip no doxygen
       ;;
       htslib)
-      test @have_htslib@ = "yes" || exit_skip no libbam
+      test x"${have_htslib}" = x"yes" || exit_skip no libbam
       ;;
       libmy-shared)
@@ -97 +97 @@
       ;;
       shared)
-      if (test "x@enable_shared@" = "xno"); then
+      if (test "x${enable_shared}" = "xno"); then
         echo shared disabled;
         exit_skip;
@@ -103 +103 @@
       ;;
       static)
-      if (test "x@enable_static@" = "xno"); then
+      if (test "x${enable_static}" = "xno"); then
         echo static disabled;
         exit_skip;
@@ -127 +127 @@
 lt_cv_objdir=@lt_cv_objdir@
 have_doxygen="@have_doxygen@"
+have_htslib="@have_htslib@"
 mkdir_p="@MKDIR_P@ --verbose"
 verbose="--verbose"
@@ -146 +147 @@
 CXXFLAGS="@CXXFLAGS@"
 LDFLAGS="@LDFLAGS@"
-HAVE_HTSLIB="@HAVE_HTSLIB@"
 
 # user is always right