Changeset: 747b6deb5a02 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=747b6deb5a02
Modified Files:
NT/rules.msc
Branch: Aug2011
Log Message:
use *all* AM_CONDITIONAL conditionals from configure.ag also in Windows
diffs (103 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -244,21 +244,47 @@ NATIVE_WIN32 = 1
FILTER=findstr /v /l
FILTERPREF=/c:
+# These should cover all AM_CONDITIONALS defined in configure.ag, i.e.,
+# `grep AM_CONDITIONAL configure.ag | sed
's|^AM_CONDITIONAL(\([^,]*\),.*$|\1|' | sort -u`
!IFDEF BITS32
BITS32_FALSE=^#
!ENDIF
!IFDEF BITS64
BITS64_FALSE=^#
!ENDIF
+!IFDEF CROSS_COMPILING
+CROSS_COMPILING_FALSE=^#
+!ENDIF
!IFDEF DOCTOOLS
DOCTOOLS_FALSE=^#
!ENDIF
+!IFDEF ENABLE_CRACKERS
+ENABLE_CRACKERS_FALSE=^#
+!ENDIF
+!IFDEF ENABLE_DATACELL
+ENABLE_DATACELL_FALSE=^#
+!ENDIF
+!IFDEF HAVE_ANT
+HAVE_ANT_FALSE=^#
+!ENDIF
+!IFDEF HAVE_DEVELOPER
+HAVE_DEVELOPER_FALSE=^#
+!ENDIF
+!IFDEF HAVE_GDK
+HAVE_GDK_FALSE=^#
+!ENDIF
+!IFDEF HAVE_GEOM
+HAVE_GEOM_FALSE=^#
+!ENDIF
!IFDEF HAVE_JAVA
HAVE_JAVA_FALSE=^#
!ENDIF
!IFDEF HAVE_JAVAJDBC
HAVE_JAVAJDBC_FALSE=^#
!ENDIF
+!IFDEF HAVE_JAVAMEROCONTROL
+HAVE_JAVAMEROCONTROL_FALSE=^#
+!ENDIF
!IFDEF HAVE_LIBBZ2
HAVE_LIBBZ2_FALSE=^#
!ENDIF
@@ -292,6 +318,21 @@ HAVE_RAPTOR_FALSE=^#
!IFDEF HAVE_RUBYGEM
HAVE_RUBYGEM_FALSE=^#
!ENDIF
+!IFDEF HAVE_HAVE_SPHINXCLIENT
+HAVE_HAVE_SPHINXCLIENT_FALSE=^#
+!ENDIF
+!IFDEF HAVE_HAVE_SQL
+HAVE_HAVE_SQL_FALSE=^#
+!ENDIF
+!IFDEF HAVE_HAVE_TESTING
+HAVE_HAVE_TESTING_FALSE=^#
+!ENDIF
+!IFDEF HAVE_NATIVE_WIN32
+HAVE_NATIVE_WIN32_FALSE=^#
+!ENDIF
+!IFDEF HAVE_NOT_WIN32
+HAVE_NOT_WIN32_FALSE=^#
+!ENDIF
!IFDEF PROFILING
PROFILING_FALSE=^#
!ENDIF
@@ -300,9 +341,17 @@ CONFIGURE=$(PYTHON) $(CONFIGURE_PY) \
"prefix=$(prefix)" \
"BITS32_FALSE=$(BITS32_FALSE)" \
"BITS64_FALSE=$(BITS64_FALSE)" \
+ "CROSS_COMPILING_FALSE=$(CROSS_COMPILING_FALSE)" \
"DOCTOOLS_FALSE=$(DOCTOOLS_FALSE)" \
+ "ENABLE_CRACKERS_FALSE=$(ENABLE_CRACKERS_FALSE)" \
+ "ENABLE_DATACELL_FALSE=$(ENABLE_DATACELL_FALSE)" \
+ "HAVE_ANT_FALSE=$(HAVE_ANT_FALSE)" \
+ "HAVE_DEVELOPER_FALSE=$(HAVE_DEVELOPER_FALSE)" \
+ "HAVE_GDK_FALSE=$(HAVE_GDK_FALSE)" \
+ "HAVE_GEOM_FALSE=$(HAVE_GEOM_FALSE)" \
"HAVE_JAVA_FALSE=$(HAVE_JAVA_FALSE)" \
"HAVE_JAVAJDBC_FALSE=$(HAVE_JAVAJDBC_FALSE)" \
+ "HAVE_JAVAMEROCONTROL_FALSE=$(HAVE_JAVAMEROCONTROL_FALSE)" \
"HAVE_LIBBZ2_FALSE=$(HAVE_LIBBZ2_FALSE)" \
"HAVE_LIBXML2_FALSE=$(HAVE_LIBXML2_FALSE)" \
"HAVE_LIBZ_FALSE=$(HAVE_LIBZ_FALSE)" \
@@ -315,6 +364,11 @@ CONFIGURE=$(PYTHON) $(CONFIGURE_PY) \
"HAVE_PYTHON_FALSE=$(HAVE_PYTHON_FALSE)" \
"HAVE_RAPTOR_FALSE=$(HAVE_RAPTOR_FALSE)" \
"HAVE_RUBYGEM_FALSE=$(HAVE_RUBYGEM_FALSE)" \
+ "HAVE_HAVE_SPHINXCLIENT_FALSE=$(HAVE_HAVE_SPHINXCLIENT_FALSE)" \
+ "HAVE_HAVE_SQL_FALSE=$(HAVE_HAVE_SQL_FALSE)" \
+ "HAVE_HAVE_TESTING_FALSE=$(HAVE_HAVE_TESTING_FALSE)" \
+ "HAVE_NATIVE_WIN32_FALSE=$(HAVE_NATIVE_WIN32_FALSE)" \
+ "HAVE_NOT_WIN32_FALSE=$(HAVE_NOT_WIN32_FALSE)" \
"PROFILING_FALSE=$(PROFILING_FALSE)" \
"JDBCCLIENT_JAR=$(JDBCCLIENT_JAR)" \
"LIBICONV=$(LIBICONV)" \
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
