da875d2d49392a90c4f090125551236a1dd89267
braney
  Mon Dec 21 14:06:57 2015 -0800
tweak the HTSLIB rules a little

diff --git src/inc/common.mk src/inc/common.mk
index 95b7ee7..9dc234d 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -211,62 +211,64 @@
     MYSQLLIBS += -lstdc++
   else
     MYSQLLIBS += -lstdc++ -lrt
   endif
 endif
 
 L+=${PNGLIB}
 HG_INC+=${PNGINCL}
 
 # autodetect UCSC installation of htslib:
 ifeq (${HTSDIR},)
     HTSDIR = /hive/data/outside/htslib/${MACHTYPE}
     ifneq ($(wildcard ${HTSDIR}),)
         ifeq (${USE_HTS},)
             USE_HTS=1
-            USE_TABIX=1
-            USE_SAMTABIX=1
-            SAMTABIXDIR = ${HTSDIR}
-            SAMTABIXLIB=${HTSDIR}/libhts.a
-            HG_DEFS+=-DUSE_HTS
         endif
     endif
 endif
 
 
 # autodetect UCSC installation of samtabix:
 ifeq (${SAMTABIXDIR},)
     SAMTABIXDIR = /hive/data/outside/samtabix/${MACHTYPE}
     ifneq ($(wildcard ${SAMTABIXDIR}),)
         ifeq (${USE_SAMTABIX},)
           USE_SAMTABIX=1
         endif
     endif
 endif
 
 # pass through COREDUMP
 ifneq (${COREDUMP},)
     HG_DEFS+=-DCOREDUMP
 endif
 
 # autodetect UCSC additional source code with password for some external tracks on gbib
 GBIBDIR = /hive/groups/browser/gbib/
 ifneq ($(wildcard ${GBIBDIR}/*.c),)
   HG_DEFS+=-DUSE_GBIB_PWD
   HG_INC += -I${GBIBDIR}
 endif
 
+ifeq (${USE_HTS},1)
+    HG_DEFS+=-DUSE_HTS
+    USE_SAMTABIX=1
+    SAMTABIXDIR = ${HTSDIR}
+    SAMTABIXLIB=${HTSDIR}/libhts.a
+endif
+
 # libsamtabix (samtools + tabix + Angie's KNETFILE_HOOKS extension to it): disabled by default
 ifeq (${USE_SAMTABIX},1)
     KNETFILE_HOOKS=1
     USE_BAM=1
     USE_TABIX=1
     ifeq (${SAMTABIXINC},)
         SAMTABIXINC = ${SAMTABIXDIR}
     endif
     ifeq (${SAMTABIXLIB},)
         SAMTABIXLIB = ${SAMTABIXDIR}/libsamtabix.a
     endif
     HG_INC += -I${SAMTABIXINC}
     L+=${SAMTABIXLIB} -lz
     HG_DEFS+=-DUSE_SAMTABIX -DUSE_BAM -DUSE_TABIX -DKNETFILE_HOOKS
 else