Changeset: 7714aee60dfc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7714aee60dfc
Modified Files:
NT/monetdb_config.h.in
NT/rules.msc
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (149 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -264,9 +264,6 @@
/* Define if you have the readline library */
/* #undef HAVE_LIBREADLINE */
-/* Define if you have the libxml2 library */
-/* #undef HAVE_LIBXML2 */
-
/* Define if you have the z library */
/* #undef HAVE_LIBZ */
@@ -401,11 +398,6 @@
/* Define to 1 if you have the `round' function. */
/* #undef HAVE_ROUND */
-/* Define if you have SAX2 support in libxml2. */
-#ifdef HAVE_LIBXML2
-#define HAVE_SAX2 1
-#endif
-
/* Define to 1 if you have the `sbrk' function. */
/* #undef HAVE_SBRK */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -146,14 +146,12 @@ BZ_LIBS = "$(LIBBZIP2)\lib\libbz2$(DEBUG
BZ_CFLAGS = -DHAVE_LIBBZ2 "-I$(LIBBZIP2)\include"
!ENDIF
-!IFDEF HAVE_LIBXML2
# This is the location of the libxml2 library
!IFNDEF LIBXML2
LIBXML2 = C:\libxml2-2.6.30.win$(bits)
!ENDIF
-libxml2_CFLAGS = -DHAVE_LIBXML2 "-I$(LIBXML2)\include" $(zlib_CFLAGS)
$(ICONV_CFLAGS)
+libxml2_CFLAGS = "-I$(LIBXML2)\include" $(zlib_CFLAGS) $(ICONV_CFLAGS)
libxml2_LIBS = "$(LIBXML2)\lib\libxml2$(DEBUGLIB).lib" $(zlib_LIBS)
$(ICONV_LIBS)
-!ENDIF
!IFNDEF LIBGEOS
LIBGEOS = C:\geos-3.0.win$(bits)
@@ -337,11 +335,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) "HAVE_LIBBZ2_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_LIBXML2
- $(ECHO) "HAVE_LIBXML2_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) "HAVE_LIBXML2_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_LIBZ
$(ECHO) "HAVE_LIBZ_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
@@ -372,11 +365,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) "HAVE_PERL_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_PHP
- $(ECHO) "HAVE_PHP_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) "HAVE_PHP_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_PYTHON
$(ECHO) "HAVE_PYTHON_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
@@ -392,30 +380,30 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) "HAVE_RUBYGEM_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_HAVE_SPHINXCLIENT
- $(ECHO) "HAVE_HAVE_SPHINXCLIENT_FALSE='#'" >>
"$(TOPDIR)\winconfig_conds_new.py"
+!IFDEF HAVE_SPHINXCLIENT
+ $(ECHO) "HAVE_SPHINXCLIENT_FALSE='#'" >>
"$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_HAVE_SPHINXCLIENT_FALSE=''" >>
"$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) "HAVE_SPHINXCLIENT_FALSE=''" >>
"$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_HAVE_SQL
- $(ECHO) "HAVE_HAVE_SQL_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+!IFDEF HAVE_SQL
+ $(ECHO) "HAVE_SQL_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_HAVE_SQL_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) "HAVE_SQL_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_HAVE_TESTING
- $(ECHO) "HAVE_HAVE_TESTING_FALSE='#'" >>
"$(TOPDIR)\winconfig_conds_new.py"
+!IFDEF HAVE_TESTING
+ $(ECHO) "HAVE_TESTING_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_HAVE_TESTING_FALSE=''" >>
"$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) "HAVE_TESTING_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_NATIVE_WIN32
- $(ECHO) "HAVE_NATIVE_WIN32_FALSE='#'" >>
"$(TOPDIR)\winconfig_conds_new.py"
+!IFDEF NATIVE_WIN32
+ $(ECHO) "NATIVE_WIN32_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_NATIVE_WIN32_FALSE=''" >>
"$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) "NATIVE_WIN32_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_NOT_WIN32
- $(ECHO) "HAVE_NOT_WIN32_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+!IFDEF NOT_WIN32
+ $(ECHO) "NOT_WIN32_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_NOT_WIN32_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) "NOT_WIN32_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF PROFILING
$(ECHO) "PROFILING_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
diff --git a/buildtools/doc/HowToRelease.rst b/buildtools/doc/HowToRelease.rst
--- a/buildtools/doc/HowToRelease.rst
+++ b/buildtools/doc/HowToRelease.rst
@@ -111,12 +111,12 @@ Releasing
correct compiler, i.e., Microsoft Visual Studio 8, and options:
Use these ``nmake`` options for a 32 bit compile: ``NDEBUG=1
- HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 HAVE_PHP=1 HAVE_PCRE=1
- HAVE_MONETDB5=1 HAVE_PERL=1 HAVE_LIBXML2=1 HAVE_MONETDB5_XML=1``
+ HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 HAVE_PCRE=1
+ HAVE_MONETDB5=1 HAVE_PERL=1``
Use these ``nmake`` options for a 64 bit compile: ``bits=64 NDEBUG=1
HAVE_MONETDB5=1 HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 HAVE_PCRE=1
- HAVE_PERL=1 HAVE_LIBXML2=1 HAVE_MONETDB5_XML=1``
+ HAVE_PERL=1``
- Create PGP signatures and SHA1 checksums::
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -737,11 +737,9 @@ possible:
- ``HAVE_TESTING=1`` - include the testing component;
- ``HAVE_PYTHON=1`` - include the python component;
- ``HAVE_ICONV=1`` - the iconv library is available;
-- ``HAVE_LIBXML2=1`` - the libxml2 library is available;
- ``HAVE_RAPTOR=1`` - the raptor library is available;
- ``HAVE_OPENSSL=1`` - the OpenSSL library is available;
-- ``HAVE_PERL=1`` - Perl is available;
-- ``HAVE_PHP=1`` - PHP is available.
+- ``HAVE_PERL=1`` - Perl is available.
In addition, you can add a parameter which points to a file with extra
definitions for ``nmake``. This is very convenient to define where
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
