Changeset: 47205e66b06b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47205e66b06b Modified Files: monetdb5/extras/sphinx/30_sphinx.mal monetdb5/extras/sphinx/Makefile.ag Branch: Aug2011 Log Message:
When sphinx is enabled and installed, it should also be loaded. This causes one test to fail: modules/mal/inspect05. That test lists available functions, and with this patch, there are more functions available when sphinx is installed. diffs (38 lines): diff --git a/monetdb5/extras/sphinx/30_sphinx.mal b/monetdb5/extras/sphinx/30_sphinx.mal new file mode 100644 --- /dev/null +++ b/monetdb5/extras/sphinx/30_sphinx.mal @@ -0,0 +1,18 @@ +# The contents of this file are subject to the MonetDB Public License +# Version 1.1 (the "License"); you may not use this file except in +# compliance with the License. You may obtain a copy of the License at +# http://www.monetdb.org/Legal/MonetDBLicense +# +# Software distributed under the License is distributed on an "AS IS" +# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +# License for the specific language governing rights and limitations +# under the License. +# +# The Original Code is the MonetDB Database System. +# +# The Initial Developer of the Original Code is CWI. +# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +# Copyright August 2008-2011 MonetDB B.V. +# All Rights Reserved. + +include sphinx; diff --git a/monetdb5/extras/sphinx/Makefile.ag b/monetdb5/extras/sphinx/Makefile.ag --- a/monetdb5/extras/sphinx/Makefile.ag +++ b/monetdb5/extras/sphinx/Makefile.ag @@ -35,4 +35,10 @@ headers_sphinx_mal = { SOURCES = sphinx.mal } -EXTRA_DIST = sphinx.mal +headers_autoload = { + HEADERS = mal + DIR = libdir/monetdb5/autoload + SOURCES = 30_sphinx.mal +} + +EXTRA_DIST = sphinx.mal 30_sphinx.mal _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
