Changeset: 5a814fa20acb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a814fa20acb
Modified Files:
NT/rules.msc
testing/Mtest.py.in
Branch: leftmart
Log Message:
Merge with default branch.
diffs (26 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -356,6 +356,11 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_LIBZ_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF HAVE_LIDAR
+ $(ECHO) HAVE_LIDAR_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) HAVE_LIDAR_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF HAVE_MONETDB5
$(ECHO) HAVE_MONETDB5_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
@@ -303,6 +303,7 @@ CONDITIONALS = {
'HAVE_LIBBZ2' : "@HAVE_LIBBZ2_FALSE@",
'HAVE_LIBR' : "@HAVE_LIBR_FALSE@",
'HAVE_LIBZ' : "@HAVE_LIBZ_FALSE@",
+ 'HAVE_LIDAR' : "@HAVE_LIDAR_FALSE@",
'HAVE_MONETDB5' : "@HAVE_MONETDB5_FALSE@",
'HAVE_NETCDF' : "@HAVE_NETCDF_FALSE@",
'HAVE_ODBC' : "@HAVE_ODBC_FALSE@",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
