Changeset: 4c97e7515ea1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c97e7515ea1
Modified Files:
NT/rules.msc
testing/Mtest.py.in
Branch: default
Log Message:
Fix up conditionals.
diffs (61 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -185,10 +185,8 @@ R.lib: "$(libr_DLL)"
!ENDIF
!IFDEF HAVE_LIBPY
-
libpy_LIBS = $(PYTHON2DIR)\libs\python27.lib
libpy_CFLAGS = -DHAVE_LIBPY -I$(PYTHON2DIR)\include
-I$(PYTHON2DIR)\Lib\site-packages\numpy\core\include
-
!ENDIF
# some programs we use, probably no need to edit
@@ -281,6 +279,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"
@@ -358,11 +357,27 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_LIBBZ2_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF HAVE_LIBPY
+!IFDEF HAVE_LIBPANDAS
+ $(ECHO) HAVE_LIBPANDAS_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) HAVE_LIBPANDAS_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
+ $(ECHO) HAVE_LIBPY_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) HAVE_LIBPANDAS_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_LIBPY_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF HAVE_LIBR
$(ECHO) HAVE_LIBR_FALSE='#' >> "$(TOPDIR)\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
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -313,6 +313,7 @@ CONDITIONALS = {
'HAVE_JAVAMEROCONTROL' : "@HAVE_JAVAMEROCONTROL_FALSE@",
'HAVE_LIBBZ2' : "@HAVE_LIBBZ2_FALSE@",
'HAVE_LIBR' : "@HAVE_LIBR_FALSE@",
+ 'HAVE_LIBPANDAS' : "@HAVE_LIBPANDAS_FALSE@",
'HAVE_LIBPY' : "@HAVE_LIBPY_FALSE@",
'HAVE_LIBXML' : "@HAVE_LIBXML_FALSE@",
'HAVE_LIBZ' : "@HAVE_LIBZ_FALSE@",
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
