Changeset: f69dfdacb0ae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f69dfdacb0ae
Modified Files:
NT/monetdb_config.h.in
NT/rules.msc
Branch: SciQL-2-NetCDF
Log Message:
handle new HAVE_NETCDF conditional / #define also on Windows
diffs (28 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
@@ -343,6 +343,9 @@
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
/* #undef HAVE_NDIR_H */
+/* Define if you have netcdf installed */
+/* #undef HAVE_NETCDF */
+
/* Define to 1 if you have the <netdb.h> header file. */
/* #undef HAVE_NETDB_H */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -365,6 +365,11 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_MSEED_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF HAVE_NETCDF
+ $(ECHO) HAVE_NETCDF_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) HAVE_NETCDF_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF HAVE_ODBC
$(ECHO) HAVE_ODBC_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
