Changeset: 42ac25dd4c66 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=42ac25dd4c66
Modified Files:
MonetDB.spec
configure.ag
debian/control
debian/monetdb5-server.install
debian/rules
Branch: Mar2011
Log Message:
Create configure option to enable/disable FITS support (default=no).
Also remove FITS support from binary release.
The option is --enable-fits.
diffs (104 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -28,7 +28,7 @@
BuildRequires: bison
BuildRequires: bzip2-devel
-BuildRequires: cfitsio-devel
+# BuildRequires: cfitsio-devel
BuildRequires: flex
BuildRequires: geos-devel >= 2.2.0
BuildRequires: libcurl-devel
@@ -492,7 +492,7 @@
%exclude %{_libdir}/monetdb5/sql.mal
%exclude %{_libdir}/monetdb5/sql_bpm.mal
%{_libdir}/monetdb5/*.mal
-%{_libdir}/monetdb5/autoload/*_fits.mal
+# %{_libdir}/monetdb5/autoload/*_fits.mal
%{_libdir}/monetdb5/autoload/*_vault.mal
%exclude %{_libdir}/monetdb5/lib/lib_geom.so
# %exclude %{_libdir}/monetdb5/lib/lib_rdf.so
@@ -717,6 +717,7 @@
--enable-bits=%{bits} \
--enable-java=no \
--enable-rdf=no \
+ --enable-fits=no \
--enable-monetdb4=yes \
--enable-pathfinder=yes \
--with-gc=no \
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -154,6 +154,13 @@
enable_rdf=$enableval,
enable_rdf=$dft_rdf)
+dft_fits=no
+AC_ARG_ENABLE(fits,
+ AS_HELP_STRING([--enable-fits],
+ [enable support for FITS (default=no)]),
+ enable_fits=$enableval,
+ enable_fits=$dft_fits)
+
dft_sql=auto
AC_ARG_ENABLE(sql,
AS_HELP_STRING([--enable-sql],
@@ -2721,9 +2728,12 @@
AC_SUBST(PCL_CFLAGS)
AC_SUBST(PCL_LIBS)
-PKG_CHECK_MODULES([cfitsio], [cfitsio],
- [have_cfitsio=yes; AC_DEFINE(HAVE_CFITSIO, 1, [Define if you have the
cfitsio library])],
- [have_cfitsio=no])
+have_cfitsio=no
+if test "x$enable_fits" != xno; then
+ PKG_CHECK_MODULES([cfitsio], [cfitsio],
+ [have_cfitsio=yes; AC_DEFINE(HAVE_CFITSIO, 1, [Define if you
have the cfitsio library])],
+ [have_cfitsio=no; if test "x$enable_fits" = xyes; then
AC_MSG_ERROR([cfitsio library required for FITS support]); fi])
+fi
AM_CONDITIONAL(HAVE_CFITSIO, test x"$have_cfitsio" != xno)
LIBGC_CFLAGS=
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@
Homepage: http://www.monetdb.org/
Vcs-Browser: http://dev.monetdb.org/hg/MonetDB/
Vcs-Hg: http://dev.monetdb.org/hg/MonetDB/
-Build-Depends: debhelper (>= 5), autotools-dev, cdbs, bison, flex, libbz2-dev,
libcfitsio3-dev, libcurl4-gnutls-dev, libgeos-dev, libpcre3-dev, libperl-dev,
libreadline5-dev, libssl-dev, libxml2-dev, perl, python, ruby, rubygems, swig,
unixodbc-dev, uuid-dev, zlib1g-dev
+Build-Depends: debhelper (>= 5), autotools-dev, cdbs, bison, flex, libbz2-dev,
libcurl4-gnutls-dev, libgeos-dev, libpcre3-dev, libperl-dev, libreadline5-dev,
libssl-dev, libxml2-dev, perl, python, ruby, rubygems, swig, unixodbc-dev,
uuid-dev, zlib1g-dev
# Build-Depends: libraptor1-dev
Standards-Version: 3.8.0
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -2,9 +2,7 @@
debian/tmp/usr/bin/mserver5 usr/bin
debian/tmp/usr/lib/libmonetdb5.so.* usr/lib
debian/tmp/usr/lib/monetdb5/autoload/70_vault.mal usr/lib/monetdb5/autoload
-debian/tmp/usr/lib/monetdb5/autoload/72_fits.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/lib/lib_crackers.so usr/lib/monetdb5/lib
-debian/tmp/usr/lib/monetdb5/lib/lib_fits.so usr/lib/monetdb5/lib
debian/tmp/usr/lib/monetdb5/lib/lib_mal_compiler.so usr/lib/monetdb5/lib
debian/tmp/usr/lib/monetdb5/lib/lib_vault.so usr/lib/monetdb5/lib
debian/tmp/usr/lib/monetdb5/aggr.mal usr/lib/monetdb5
@@ -37,7 +35,6 @@
debian/tmp/usr/lib/monetdb5/counters.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/crackers.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/factories.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/fits.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/group.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/groupby.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/histogram.mal usr/lib/monetdb5
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,4 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-strict=no --enable-assert=no
--enable-debug=no --enable-optimize=yes --enable-java=no --enable-rdf=no
--enable-monetdb4=yes --enable-pathfinder=yes --with-gc=no --with-valgrind=no
--with-netcdf=no --with-mseed=no --with-rubygem-dir=lib/ruby/gems/1.8
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-strict=no --enable-assert=no
--enable-debug=no --enable-optimize=yes --enable-java=no --enable-rdf=no
--enable-fits=no --enable-monetdb4=yes --enable-pathfinder=yes --with-gc=no
--with-valgrind=no --with-netcdf=no --with-mseed=no
--with-rubygem-dir=lib/ruby/gems/1.8
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
