ce79ffa05bf8918633c416ee07c14da24d959165 angie Wed Aug 8 10:27:02 2012 -0700 Feature #3265 (nightly cron job should build utils and cgis with various USE_* options):Tim found that build breaks with USE_BAM=0 USE_TABIX=1 USE_KNETFILE_HOOKS=1 -- fixing. diff --git src/lib/knetUdc.c src/lib/knetUdc.c index eb8bf82..fdba740 100644 --- src/lib/knetUdc.c +++ src/lib/knetUdc.c @@ -1,19 +1,19 @@ /* knetUdc -- install udc i/o functions in knetfile interface in samtools. */ /* As of 2/23/10, the KNETFILE_HOOKS extension is a UCSC-local modification of samtools. */ -#if (defined USE_BAM && defined KNETFILE_HOOKS) +#if ((defined USE_BAM || defined USE_TABIX) && defined KNETFILE_HOOKS) #include "common.h" #include "udc.h" #include "knetUdc.h" #include "knetfile.h" struct knetFile_s { struct udcFile *udcf; }; // typedef'd to knetFile in knetfile.h static char *udcCacheDir = NULL; static knetFile *kuOpen(const char *filename, const char *mode) /* Open the given filename with mode which must be "r". */ @@ -71,16 +71,16 @@ static int kuClose(knetFile *fp) /* Close and free fp->udcf. */ { verbose(2, "udcClose(%lu)\n", (unsigned long)(fp->udcf)); udcFileClose(&(fp->udcf)); return 0; } void knetUdcInstall() /* install udc i/o functions in knetfile interface in Heng Li's samtools lib. */ { // maybe init udcCacheDir from hg.conf? knet_init_alt(kuOpen, kuDopen, kuRead, kuSeek, kuTell, kuClose); } -#endif//def USE_BAM && KNETFILE_HOOKS +#endif//def (USE_BAM || USE_TABIX) && KNETFILE_HOOKS