Changeset: ae023edd9dd3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ae023edd9dd3
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/doc/HowToRelease.rst
buildtools/doc/windowsbuild.rst
testing/Mtest.py.in
Branch: Aug2011
Log Message:
removed obsolete traces of (incomplete) NETCDF support
diffs (82 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -551,8 +551,7 @@
--with-mseed=no \
--with-geos=%{?centos:no}%{!?centos:yes}
%{?oid32:--enable-oid32} \
- %{?comp_cc:CC="%{comp_cc}"} \
- %{?_with_netcdf} %{?_without_netcdf}
+ %{?comp_cc:CC="%{comp_cc}"}
make
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
@@ -234,9 +234,6 @@
/* Define to 1 if you have the <libintl.h> header file. */
/* #undef HAVE_LIBINTL_H */
-/* Define if you have the netcdf library */
-/* #undef HAVE_LIBNETCDF */
-
/* Define if you have the pcl library */
/* #undef HAVE_LIBPCL */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -271,9 +271,6 @@
!IFDEF HAVE_RAPTOR
HAVE_RAPTOR_FALSE=^#
!ENDIF
-!IFDEF HAVE_NETCDF
-HAVE_NETCDF_FALSE=^#
-!ENDIF
!IFDEF HAVE_ODBC
HAVE_ODBC_FALSE=^#
!ENDIF
@@ -318,7 +315,6 @@
"HAVE_LIBZ_FALSE=$(HAVE_LIBZ_FALSE)" \
"HAVE_MONETDB5_FALSE=$(HAVE_MONETDB5_FALSE)" \
"HAVE_MSEED_FALSE=$(HAVE_MSEED_FALSE)" \
- "HAVE_NETCDF_FALSE=$(HAVE_NETCDF_FALSE)" \
"HAVE_OPENSSL_FALSE=$(HAVE_OPENSSL_FALSE)" \
"HAVE_ODBC_FALSE=$(HAVE_ODBC_FALSE)" \
"HAVE_PCRE_FALSE=$(HAVE_PCRE_FALSE)" \
diff --git a/buildtools/doc/HowToRelease.rst b/buildtools/doc/HowToRelease.rst
--- a/buildtools/doc/HowToRelease.rst
+++ b/buildtools/doc/HowToRelease.rst
@@ -63,8 +63,7 @@
- Set version numbers in the new stable branch (e.g. ``vertoo.py -m
MonetDB set 1.24.0``).
- Change defaults in ``configure.ag`` for release builds
- (``dft_strict=no``, ``dft_assert=no``, ``dft_optimi=yes``,
- ``dft_netcdf=no``).
+ (``dft_strict=no``, ``dft_assert=no``, ``dft_optimi=yes``).
- Create a tag on the head of the new branch for propagation purposes
(e.g. ``cvs tag MonetDB_1-24_sync``).
- Update the nightly testing setup to use the new branch for nightly
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -755,7 +755,6 @@
- ``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_NETCDF=1`` - the netcdf library is available;
- ``HAVE_OPENSSL=1`` - the OpenSSL library is available;
- ``HAVE_PERL=1`` - Perl is available;
- ``HAVE_PERL_DEVEL=1`` - Perl development is possible (include files
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -216,7 +216,6 @@
'HAVE_LIBZ' : "@HAVE_LIBZ_FALSE@",
'HAVE_MONETDB5' : "@HAVE_MONETDB5_FALSE@",
'HAVE_MSEED' : "@HAVE_MSEED_FALSE@",
- 'HAVE_NETCDF' : "@HAVE_NETCDF_FALSE@",
'HAVE_ODBC' : "@HAVE_ODBC_FALSE@",
'HAVE_PCRE' : "@HAVE_PCRE_FALSE@",
'HAVE_PERL_DEVEL' : "@HAVE_PERL_DEVEL_FALSE@",
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
