Changeset: e9f351f816d8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e9f351f816d8 Modified Files: MonetDB5/src/modules/atoms/05_xml.mal MonetDB5/src/modules/atoms/Makefile.ag MonetDB5/src/modules/mal/mal_init.mx Branch: Oct2010 Log Message:
made loading module xml optional If module xml is optional, and its compilation is optional (depending on the availability of libxml2), also loading the module must be optional. diffs (53 lines): diff -r a02ba0cda6b6 -r e9f351f816d8 MonetDB5/src/modules/atoms/05_xml.mal --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MonetDB5/src/modules/atoms/05_xml.mal Wed Oct 06 19:04:09 2010 +0200 @@ -0,0 +1,20 @@ +# 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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# +# 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-2010 MonetDB B.V. +# All Rights Reserved. + +# This loads the MonetDB/XML module +include xml; +include batxml; diff -r a02ba0cda6b6 -r e9f351f816d8 MonetDB5/src/modules/atoms/Makefile.ag --- a/MonetDB5/src/modules/atoms/Makefile.ag Wed Oct 06 16:27:44 2010 +0200 +++ b/MonetDB5/src/modules/atoms/Makefile.ag Wed Oct 06 19:04:09 2010 +0200 @@ -67,6 +67,13 @@ $(LIBXML2_LIBS) $(ICONV_LIBS) ../../mal/libmonetdb5 } +headers_xml_autoload = { + COND = HAVE_LIBXML2 + HEADERS = mal + DIR = libdir/MonetDB5/autoload + SOURCES = 05_xml.mal +} + headers_xml_h = { COND = HAVE_LIBXML2 DIR = includedir/MonetDB5/atoms diff -r a02ba0cda6b6 -r e9f351f816d8 MonetDB5/src/modules/mal/mal_init.mx --- a/MonetDB5/src/modules/mal/mal_init.mx Wed Oct 06 16:27:44 2010 +0200 +++ b/MonetDB5/src/modules/mal/mal_init.mx Wed Oct 06 19:04:09 2010 +0200 @@ -256,8 +256,6 @@ include opt_remoteQueries; include crackers; -include xml; -include batxml; @- @mal # Any extensions (MAL scripts) that should be automatically loaded upon _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
