Changeset: 7ea91f354c1a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ea91f354c1a
Modified Files:
NT/rules.msc
Branch: Jun2016
Log Message:
Fix up conditionals.
Partial backport of changeset 4c97e7515ea1.
diffs (23 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -274,6 +274,7 @@ create_winconfig_conds_new_py:
$(ECHO) # > "$(TOPDIR)\winconfig_conds_new.py"
!IFDEF BITS32
$(ECHO) BITS32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) BITS64_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
$(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
$(ECHO) BITS32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
@@ -356,6 +357,11 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_LIBR_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF HAVE_LIBXML
+ $(ECHO) HAVE_LIBXML_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) HAVE_LIBXML_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF HAVE_LIBZ
$(ECHO) HAVE_LIBZ_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
