Changeset: af5cfb5e752d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af5cfb5e752d
Modified Files:
NT/rules.msc
testing/Mtest.py.in
Branch: bamloader
Log Message:
enable (autoconf-)conditional HAVE_SAMTOOLS also on Windows and in Mtest.py
diffs (26 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -411,6 +411,11 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_RUBYGEM_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF HAVE_SAMTOOLS
+ $(ECHO) HAVE_SAMTOOLS_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) HAVE_SAMTOOLS_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF HAVE_SPHINXCLIENT
$(ECHO) HAVE_SPHINXCLIENT_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
@@ -330,6 +330,7 @@ CONDITIONALS = {
'HAVE_PYTHON3' : "@HAVE_PYTHON3_FALSE@",
'HAVE_RAPTOR' : "@HAVE_RAPTOR_FALSE@",
'HAVE_RUBYGEM' : "@HAVE_RUBYGEM_FALSE@",
+ 'HAVE_SAMTOOLS' : "@HAVE_SAMTOOLS_FALSE@",
'HAVE_SPHINXCLIENT' : "@HAVE_SPHINXCLIENT_FALSE@",
'HAVE_SQL' : "@HAVE_SQL_FALSE@",
'HAVE_TESTING' : "@HAVE_TESTING_FALSE@",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
