11e45667d4e291b3038ccda729a1cdf5bcaf004a braney Mon Jul 11 15:46:54 2016 -0700 incorporate htslib in kent src, remove USE_BAM, USE_SAMTABIX, USE_TABIX defines, modify a bunch of makefiles to include kentSrc variable pointing to top of the tree. diff --git src/lib/tests/tabixFetch.c src/lib/tests/tabixFetch.c index e3104e2..1e61411 100644 --- src/lib/tests/tabixFetch.c +++ src/lib/tests/tabixFetch.c @@ -1,24 +1,23 @@ /* tabixFetch - Test lineFileTabixMayOpen and lineFileSetTabixRegion (compare with cmd line tabix output). */ /* Copyright (C) 2011 The Regents of the University of California * See README in this or parent directory for licensing information. */ #include "common.h" #include "linefile.h" #include "options.h" -#ifdef USE_TABIX #include "sqlNum.h" #include "udc.h" #include "knetUdc.h" void usage() /* Explain usage and exit. */ { errAbort( "tabixFetch - Test lineFileTabixMayOpen and lineFileSetTabixRegion (compare\n" " with command-line tabix output)\n" "usage:\n" " tabixFetch fileOrUrl chrom:start-end\n" @@ -94,24 +93,15 @@ printf("*** No lines returned from query on %s\n", position); } lineFileClose(&lf); } int main(int argc, char *argv[]) /* Process command line. */ { optionInit(&argc, argv, options); if (argc != 3) usage(); tabixFetch(argv[1], argv[2]); return 0; } -#else // no USE_TABIX -int main(int argc, char *argv[]) -/* Process command line. */ -{ -errAbort(COMPILE_WITH_TABIX, "tabixFetch"); -return 1; -} - -#endif // no USE_TABIX