Changeset: d915ee788ef5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d915ee788ef5
Modified Files:
NT/rules.msc
buildtools/doc/HowToRelease.rst
buildtools/doc/windowsbuild.rst
Branch: Aug2011
Log Message:
removed obsolete conditional HAVE_PHP also on Windows
We do no longer require php for compilation,
and Mtest check at runtime itself whether php is available;
hence, conditional HAVE_PHP has been obsoleted some time ago.
diffs (40 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -355,11 +355,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
diff --git a/buildtools/doc/HowToRelease.rst b/buildtools/doc/HowToRelease.rst
--- a/buildtools/doc/HowToRelease.rst
+++ b/buildtools/doc/HowToRelease.rst
@@ -111,7 +111,7 @@ 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_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 HAVE_PCRE=1
HAVE_MONETDB5=1 HAVE_PERL=1 HAVE_MONETDB5_XML=1``
Use these ``nmake`` options for a 64 bit compile: ``bits=64 NDEBUG=1
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -739,8 +739,7 @@ possible:
- ``HAVE_ICONV=1`` - the iconv 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
