Changeset: 27c8735df452 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27c8735df452
Modified Files:
NT/monetdb_config.h.in
NT/rules.msc
testing/Mtest.py.in
Branch: sciql
Log Message:
properly handle new HAVE_GDAL conditional also on Windows
diffs (39 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
@@ -150,6 +150,9 @@
/* Define if you use garbage collection */
/* #undef HAVE_GC */
+/* Define if you have the gdal library */
+/* #undef HAVE_GDAL */
+
/* Define to 1 if you have the <geos_c.h> header file. */
/* #undef HAVE_GEOS_C_H */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -304,6 +304,11 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_DEVELOPER_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF HAVE_GDAL
+ $(ECHO) "HAVE_GDAL_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) "HAVE_GDAL_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF HAVE_GDK
$(ECHO) HAVE_GDK_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -311,6 +311,7 @@ CONDITIONALS = {
'ENABLE_DATACELL' : "@ENABLE_DATACELL_FALSE@",
'HAVE_CFITSIO' : "@HAVE_CFITSIO_FALSE@",
'HAVE_DEVELOPER' : "@HAVE_DEVELOPER_FALSE@",
+ 'HAVE_GDAL' : "@HAVE_GDAL_FALSE@",
'HAVE_GDK' : "@HAVE_GDK_FALSE@",
'HAVE_GEOM' : "@HAVE_GEOM_FALSE@",
'HAVE_GEOTIFF' : "@HAVE_GEOTIFF_FALSE@",
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
