Changeset: a1ba9e176517 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a1ba9e176517
Modified Files:
NT/rules.msc
testing/Mtest.py.in
Branch: bamloader
Log Message:
reverting changes that introduce HTS library (and dependent changes) (here:
changeset b9e25615c447)
HTS library is not yet widely available (in particular not on Fedora);
hence, for now we fall-back to using SAMTOOLS;
later, we will "gradually" shift towards using the HTS library.
(Robin, Sjoerd & Stefan)
diffs (26 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -294,11 +294,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) DOCTOOLS_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF ENABLE_BAM
- $(ECHO) ENABLE_BAM_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) ENABLE_BAM_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF ENABLE_CRACKERS
$(ECHO) ENABLE_CRACKERS_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -305,7 +305,6 @@ CONDITIONALS = {
'BITS64' : "@BITS64_FALSE@",
'CROSS_COMPILING' : "@CROSS_COMPILING_FALSE@",
'DOCTOOLS' : "@DOCTOOLS_FALSE@",
- 'ENABLE_BAM' " :@ENABLE_BAM@",
'ENABLE_CRACKERS' : "@ENABLE_CRACKERS_FALSE@",
'ENABLE_DATACELL' : "@ENABLE_DATACELL_FALSE@",
'HAVE_CFITSIO' : "@HAVE_CFITSIO_FALSE@",
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
