Changeset 3890


Ignore:
Timestamp:
Mar 26, 2020, 2:40:56 AM (2 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/m4/yat_check_htslib.m4

    r3885 r3890  
    11## $Id$
    22#
    3 # serial 6 (yat 0.18)
     3# serial 7 (yat 0.18)
    44#
    55#   Copyright (C) 2016, 2018, 2020 Peter Johansson
     
    5151# propagate some results to 'Makefile' and 'config.h'
    5252AM_CONDITIONAL([HAVE_HTSLIB], [test x"$with_htslib" = x"yes"])
    53 have_htslib=$with_htslib
    54 AC_SUBST([have_htslib])
     53AC_SUBST([have_htslib], [$with_htslib])
    5554AM_CONDITIONAL([HAVE_SAMTOOLS_EXECUTABLE], [test x"$SAMTOOLS" != x"false"])
    5655AC_SUBST([SAMTOOLS])
     
    125124    AC_MSG_FAILURE([htslib was not found])
    126125  ])
    127   AC_SUBST([HAVE_HTSLIB], [$have_hts])
    128126
    129127  YAT_CHECK_LA_LIBS([
  • trunk/test/defs.sh.in

    r3855 r3890  
    7979      ;;
    8080      doxygen)
    81       test @have_doxygen@ = "yes" || exit_skip no doxygen
     81      test x"${have_doxygen}" = x"yes" || exit_skip no doxygen
    8282      ;;
    8383      htslib)
    84       test @have_htslib@ = "yes" || exit_skip no libbam
     84      test x"${have_htslib}" = x"yes" || exit_skip no libbam
    8585      ;;
    8686      libmy-shared)
     
    9797      ;;
    9898      shared)
    99       if (test "x@enable_shared@" = "xno"); then
     99      if (test "x${enable_shared}" = "xno"); then
    100100        echo shared disabled;
    101101        exit_skip;
     
    103103      ;;
    104104      static)
    105       if (test "x@enable_static@" = "xno"); then
     105      if (test "x${enable_static}" = "xno"); then
    106106        echo static disabled;
    107107        exit_skip;
     
    127127lt_cv_objdir=@lt_cv_objdir@
    128128have_doxygen="@have_doxygen@"
     129have_htslib="@have_htslib@"
    129130mkdir_p="@MKDIR_P@ --verbose"
    130131verbose="--verbose"
     
    146147CXXFLAGS="@CXXFLAGS@"
    147148LDFLAGS="@LDFLAGS@"
    148 HAVE_HTSLIB="@HAVE_HTSLIB@"
    149149
    150150# user is always right
Note: See TracChangeset for help on using the changeset viewer.