Changeset 3068 for trunk/yat

Timestamp:

Aug 1, 2013, 5:16:44 AM (9 years ago)

Author:

Peter

Message:

Fixes #766

Replace #defines HAVE_BAM_H (and friends) in
yat/utility/config_public.h with #defines YAT_HAVE_BAM_H (and
friends). Update logic in yat/omic/config_bam.h accordingly as well as
test code in libbam detection.

Location:

trunk/yat

Files:

• omic/config_bam.h (modified) (1 diff)
• utility/config_public.h.in (modified) (1 diff)

trunk/yat/omic/config_bam.h

@@ -34 +34 @@
 #include "yat/utility/config_public.h"
 
-#ifdef HAVE_BAM_H
+#ifdef YAT_HAVE_BAM_H
 # define YAT_BAM_HEADER "bam.h"
 # define YAT_SAM_HEADER "sam.h"
 #else
-# ifdef HAVE_BAM_BAM_H
+# ifdef YAT_HAVE_BAM_BAM_H
 #  define YAT_BAM_HEADER "bam/bam.h"
 #  define YAT_SAM_HEADER "bam/sam.h"
 # else
-#  ifdef HAVE_SAMTOOLS_BAM_H
+#  ifdef YAT_HAVE_SAMTOOLS_BAM_H
 #   define YAT_BAM_HEADER "samtools/bam.h"
 #   define YAT_SAM_HEADER "samtools/sam.h"

trunk/yat/utility/config_public.h.in

@@ -29 +29 @@
 
 /// Define to 1 if you have the <bam/bam.h> header file.
-#undef HAVE_BAM_BAM_H
+#undef YAT_HAVE_BAM_BAM_H
 
 /// Define to 1 if you have the <bam.h> header file.
-#undef HAVE_BAM_H
+#undef YAT_HAVE_BAM_H
 
 /// Define to 1 if you have the <samtools/bam.h> header file.
-#undef HAVE_SAMTOOLS_BAM_H
+#undef YAT_HAVE_SAMTOOLS_BAM_H
 
 /// Define if compiler supports deprecated attribute, as in g++ 4.0