Changeset: a6e80c6543fb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6e80c6543fb
Modified Files:
MonetDB.spec
configure.ag
Branch: default
Log Message:
Disable RDF support by default. Enable with --enable-rdf.
RDF support is extremely limited at the moment and therefore not
useful for the general public. Hence it should be disabled by
default.
diffs (132 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -36,7 +36,7 @@
BuildRequires: perl
BuildRequires: perl-devel
BuildRequires: python
-BuildRequires: raptor-devel >= 1.4.16
+# BuildRequires: raptor-devel >= 1.4.16
BuildRequires: readline-devel
BuildRequires: ruby
BuildRequires: rubygems
@@ -422,6 +422,7 @@
Requires(pre): shadow-utils
Requires: %{name}-client = %{version}-%{release}
Obsoletes: MonetDB5-server-devel
+Obsoletes: MonetDB5-server-rdf
%description -n MonetDB5-server
MonetDB is a database management system that is developed from a
@@ -465,7 +466,7 @@
%dir %{_libdir}/monetdb5/autoload
%dir %{_libdir}/monetdb5/lib
%exclude %{_libdir}/monetdb5/geom.mal
-%exclude %{_libdir}/monetdb5/rdf.mal
+# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
%exclude %{_libdir}/monetdb5/sql_bpm.mal
%{_libdir}/monetdb5/*.mal
@@ -473,30 +474,30 @@
%{_libdir}/monetdb5/autoload/*_vault.mal
%{_libdir}/monetdb5/autoload/*_xml.mal
%exclude %{_libdir}/monetdb5/lib/lib_geom.*
-%exclude %{_libdir}/monetdb5/lib/lib_rdf.*
+# %exclude %{_libdir}/monetdb5/lib/lib_rdf.*
%exclude %{_libdir}/monetdb5/lib/lib_sql.*
%{_libdir}/monetdb5/lib/*.so*
%doc %{_mandir}/man5/monetdb5.conf.5.gz
-%package -n MonetDB5-server-rdf
-Summary: MonetDB RDF interface
-Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
+# %package -n MonetDB5-server-rdf
+# Summary: MonetDB RDF interface
+# Group: Applications/Databases
+# Requires: MonetDB5-server = %{version}-%{release}
-%description -n MonetDB5-server-rdf
-MonetDB is a database management system that is developed from a
-main-memory perspective with use of a fully decomposed storage model,
-automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+# %description -n MonetDB5-server-rdf
+# MonetDB is a database management system that is developed from a
+# main-memory perspective with use of a fully decomposed storage model,
+# automatic index management, extensibility of data types and search
+# accelerators, SQL- and XML- frontends.
-This package contains the MonetDB5 RDF module.
+# This package contains the MonetDB5 RDF module.
-%files -n MonetDB5-server-rdf
-%defattr(-,root,root)
-%{_libdir}/monetdb5/autoload/*_rdf.mal
-%{_libdir}/monetdb5/lib/lib_rdf.so*
-%{_libdir}/monetdb5/rdf.mal
-%{_libdir}/monetdb5/createdb/*_rdf.sql
+# %files -n MonetDB5-server-rdf
+# %defattr(-,root,root)
+# %{_libdir}/monetdb5/autoload/*_rdf.mal
+# %{_libdir}/monetdb5/lib/lib_rdf.so*
+# %{_libdir}/monetdb5/rdf.mal
+# %{_libdir}/monetdb5/createdb/*_rdf.sql
%package SQL-server5
Summary: MonetDB5 SQL server modules
@@ -525,7 +526,7 @@
%{_libdir}/monetdb5/*.sql
%dir %{_libdir}/monetdb5/createdb
%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
-%exclude %{_libdir}/monetdb5/createdb/*_rdf.sql
+# %exclude %{_libdir}/monetdb5/createdb/*_rdf.sql
%{_libdir}/monetdb5/createdb/*
%{_libdir}/monetdb5/sql*.mal
%doc %{_mandir}/man1/monetdb.1.gz
@@ -694,6 +695,7 @@
--enable-optimize=yes \
--enable-bits=%{bits} \
--enable-java=no \
+ --enable-rdf=no \
--with-gc=no \
--with-valgrind=no \
%{?oid32:--enable-oid32} \
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -134,6 +134,13 @@
enable_monetdb5=$enableval,
enable_monetdb5=$dft_monetdb5)
+dft_rdf=no
+AC_ARG_ENABLE(rdf,
+ AS_HELP_STRING([--enable-rdf],
+ [enable support for RDF (default=no)]),
+ enable_rdf=$enableval,
+ enable_rdf=$dft_rdf)
+
dft_sql=auto
AC_ARG_ENABLE(sql,
AS_HELP_STRING([--enable-sql],
@@ -2326,11 +2333,15 @@
;;
esac
-req_raptor_ver='1.4.16'
-PKG_CHECK_EXISTS([raptor >= $req_raptor_ver], [have_raptor="yes"],
[have_raptor="no"])
-if test x"$have_raptor" = x"yes" ; then
- PKG_CHECK_MODULES([raptor], [raptor >= $req_raptor_ver])
- AC_DEFINE(HAVE_RAPTOR, 1, [Define if you have the raptor library])
+have_raptor=no
+if test "x$enable_rdf" != xno; then
+ req_raptor_ver='1.4.16'
+ PKG_CHECK_EXISTS([raptor >= $req_raptor_ver], [have_raptor="yes"],
[have_raptor="no"])
+ # if RDF is explicitly enabled, raptor library is required
+ if test x"$have_raptor" = x"yes" -o "x$enable_rdf" = xyes; then
+ PKG_CHECK_MODULES([raptor], [raptor >= $req_raptor_ver])
+ AC_DEFINE(HAVE_RAPTOR, 1, [Define if you have the raptor
library])
+ fi
fi
AM_CONDITIONAL(HAVE_RAPTOR, test x"$have_raptor" != xno)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
