Changeset 3413

Timestamp:

Apr 27, 2015, 8:33:48 AM (8 years ago)

Author:

Peter

Message:

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

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)
• test/Suite.cc (modified) (1 diff)

trunk/configure.ac

@@ -404 +404 @@
 have_htslib=$with_htslib
 AC_SUBST([have_htslib])
-AM_CONDITIONAL([HAVE_SAMTOOLS], [test x"$SAMTOOLS" != x"false"])
+AM_CONDITIONAL([HAVE_SAMTOOLS_EXECUTABLE], [test x"$SAMTOOLS" != x"false"])
 AC_SUBST([SAMTOOLS])
 AS_IF([test x"$SAMTOOLS" = x"false"], [], [
-  AC_DEFINE([HAVE_SAMTOOLS], [1], [Define if samtools executable is available])
+  AC_DEFINE([HAVE_SAMTOOLS_EXECUTABLE], [1],
+            [Define if samtools executable is available])
 ])
 

trunk/test/Makefile.am

@@ -314 +314 @@
   @: > $@
 
-if HAVE_SAMTOOLS
+if HAVE_SAMTOOLS_EXECUTABLE
 test/data/foo.bam: test/data/foo.sam test/data/.dirstamp Makefile
   $(AM_V_GEN)

trunk/test/Suite.cc

@@ -49 +49 @@
       exit (EXIT_SKIP);
 #endif
-#ifndef HAVE_SAMTOOLS
+#ifndef HAVE_SAMTOOLS_EXECUTABLE
       out() << "no samtools\n";
       exit (EXIT_SKIP);