Changeset 3413


Ignore:
Timestamp:
Apr 27, 2015, 8:33:48 AM (4 years ago)
Author:
Peter
Message:

Prefer variable name HAVE_SAMTOOLS_EXECUTABLE instead of HAVE_SAMTOOLS
for clarity. refs #794.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r3400 r3413  
    404404have_htslib=$with_htslib
    405405AC_SUBST([have_htslib])
    406 AM_CONDITIONAL([HAVE_SAMTOOLS], [test x"$SAMTOOLS" != x"false"])
     406AM_CONDITIONAL([HAVE_SAMTOOLS_EXECUTABLE], [test x"$SAMTOOLS" != x"false"])
    407407AC_SUBST([SAMTOOLS])
    408408AS_IF([test x"$SAMTOOLS" = x"false"], [], [
    409   AC_DEFINE([HAVE_SAMTOOLS], [1], [Define if samtools executable is available])
     409  AC_DEFINE([HAVE_SAMTOOLS_EXECUTABLE], [1],
     410            [Define if samtools executable is available])
    410411])
    411412
  • trunk/test/Makefile.am

    r3405 r3413  
    314314  @: > $@
    315315
    316 if HAVE_SAMTOOLS
     316if HAVE_SAMTOOLS_EXECUTABLE
    317317test/data/foo.bam: test/data/foo.sam test/data/.dirstamp Makefile
    318318  $(AM_V_GEN)
  • trunk/test/Suite.cc

    r3210 r3413  
    4949      exit (EXIT_SKIP);
    5050#endif
    51 #ifndef HAVE_SAMTOOLS
     51#ifndef HAVE_SAMTOOLS_EXECUTABLE
    5252      out() << "no samtools\n";
    5353      exit (EXIT_SKIP);
Note: See TracChangeset for help on using the changeset viewer.