Changeset: ac9fd3c41323 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ac9fd3c41323 Modified Files: MonetDB.spec NT/monetdb_config.h.in NT/rules.msc testing/Mtest.py.in Branch: sciql Log Message:
make geotiff know where it (might) need to be known: - MonetDB.spec (disabled/commented-out for now) - Windows configuration (disabled/not used for now) - Mtest.py (conditional) diffs (67 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -31,7 +31,7 @@ Source: http://dev.monetdb.org/downloads BuildRequires: bison BuildRequires: bzip2-devel -# BuildRequires: cfitsio-devel +# BuildRequires: cfitsio-devel libgeotiff-devel BuildRequires: flex %if %{?centos:0}%{!?centos:1} # no geos library on CentOS @@ -389,6 +389,7 @@ fi %exclude %{_libdir}/monetdb5/sql.mal %{_libdir}/monetdb5/*.mal # %{_libdir}/monetdb5/autoload/*_fits.mal +# %{_libdir}/monetdb5/autoload/*_geotiff.mal %{_libdir}/monetdb5/autoload/*_vault.mal %{_libdir}/monetdb5/autoload/*_lsst.mal %{_libdir}/monetdb5/autoload/*_udf.mal @@ -563,6 +564,7 @@ developer, but if you do want to test, t --enable-debug=no \ --enable-developer=no \ --enable-fits=no \ + --enable-geotiff=no \ --enable-gdk=yes \ --enable-geom=%{?centos:no}%{!?centos:yes} \ --enable-instrument=no \ 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 @@ -153,6 +153,9 @@ /* Define to 1 if you have the <geos_c.h> header file. */ /* #undef HAVE_GEOS_C_H */ +/* Define if you have the geotiff library */ +/* #undef HAVE_GEOTIFF */ + /* Define to 1 if you have the `getaddrinfo' function. */ #define HAVE_GETADDRINFO 1 diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -309,6 +309,11 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_GEOM_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF +!IFDEF HAVE_GEOTIFF + $(ECHO) "HAVE_GEOTIFF_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py" +!ELSE + $(ECHO) "HAVE_GEOTIFF_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py" +!ENDIF !IFDEF HAVE_JAVA $(ECHO) HAVE_JAVA_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !IFDEF HAVE_JAVAJDBC diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in --- a/testing/Mtest.py.in +++ b/testing/Mtest.py.in @@ -268,6 +268,7 @@ CONDITIONALS = { 'HAVE_DEVELOPER' : "@HAVE_DEVELOPER_FALSE@", 'HAVE_GDK' : "@HAVE_GDK_FALSE@", 'HAVE_GEOM' : "@HAVE_GEOM_FALSE@", + 'HAVE_GEOTIFF' : "@HAVE_GEOTIFF_FALSE@", 'HAVE_JAVA' : "@HAVE_JAVA_FALSE@", 'HAVE_JAVAJDBC' : "@HAVE_JAVAJDBC_FALSE@", 'HAVE_JAVAMEROCONTROL' : "@HAVE_JAVAMEROCONTROL_FALSE@", _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
