Update of /cvsroot/monetdb/geom/conf
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18194/conf
Modified Files:
monetdb-geom-config.bat.in monetdb-geom-config.in
Log Message:
Reviving MonetDB4 support for the "Geom(etry)" module.
When MonetDB4 support for SQL had been discontinued some weeks ago,
I was too eager to also discontinue MonetDB4 support the "Geom(etry)" module,
assuming it was only used together with SQL.
However, it appears, now, that Geom is also (to be?) used together with XQuery,
and hence still requires MonetDB4 support.
Basically, this check-in reverts most of the changes between CVS tags
"with_MonetDB4" & "implicit_MonetDB5", only the obsolete "RunMserver5.bat.in"
script and MonetDB4-specific files of the (SQL-based) tests are not revived.
For convenience, these changes are wrapped in CVS tags
"before_reviving_MonetDB4_support" & "after_reviving_MonetDB4_support".
U monetdb-geom-config.in
Index: monetdb-geom-config.in
===================================================================
RCS file: /cvsroot/monetdb/geom/conf/monetdb-geom-config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- monetdb-geom-config.in 29 Oct 2008 18:51:59 -0000 1.6
+++ monetdb-geom-config.in 15 Dec 2008 14:11:51 -0000 1.7
@@ -26,6 +26,7 @@
exec_prefix="@Qexec_prefix@"
libdir="@Qlibdir@"
+M4libdir="${libdir}/MonetDB4"
M5libdir="${libdir}/MonetDB5"
usage()
@@ -37,6 +38,7 @@
--build print ${pkg} build directory
--source print ${pkg} source directory
+ --modpath4 print default ${pkg} module path (for M4)
--modpath5 print default ${pkg} module path (for M5)
--conds conditionals as set by configure
--help display this help and exit
@@ -73,6 +75,10 @@
echo $source
;;
+ --modpath4)
+ echo $M4libdir:$M4libdir/lib:$M4libdir/bin
+ ;;
+
--modpath5)
echo $M5libdir:$M5libdir/lib:$M5libdir/bin
;;
@@ -87,6 +93,7 @@
echo doctoo...@doctools_false@
echo have_buildtoo...@have_buildtools_false@
echo have_extra_...@have_extra_mk_false@
+ echo have_monetd...@have_monetdb4_false@
echo have_monetd...@have_monetdb5_false@
echo have_monet...@have_monetdb_false@
echo have_pc...@have_pcre_false@
U monetdb-geom-config.bat.in
Index: monetdb-geom-config.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/conf/monetdb-geom-config.bat.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- monetdb-geom-config.bat.in 29 Oct 2008 18:51:59 -0000 1.6
+++ monetdb-geom-config.bat.in 15 Dec 2008 14:11:51 -0000 1.7
@@ -11,7 +11,9 @@
set pref...@prefix@
set exec_pref...@exec_prefix@
set libd...@libdir@
+set M4libdir=%libdir%\MonetDB4
set M5libdir=%libdir%\MonetDB5
+set modpath4=%M4libdir%
set modpath5=%M5libdir%
if "%1" == "" goto usage
@@ -27,6 +29,7 @@
if "%1" == "--source" echo %source%& goto shift
if "%1" == "--build" echo %build%& goto shift
if "%1" == "--prefix" echo %prefix%& goto shift
+if "%1" == "--modpath4" echo %modpath4%& goto shift
if "%1" == "--modpath5" echo %modpath5%& goto shift
if not "%1" == "--conds" goto usage
@@ -36,6 +39,7 @@
echo doctoo...@doctools_false@
echo have_buildtoo...@have_buildtools_false@
echo have_extra_...@have_extra_mk_false@
+ echo have_monetd...@have_monetdb4_false@
echo have_monetd...@have_monetdb5_false@
echo have_monet...@have_monetdb_false@
echo have_pc...@have_pcre_false@
@@ -65,6 +69,7 @@
echo.
echo --build print %pkg% build directory
echo --source print %pkg% source directory
+ echo --modpath4 print default %pkg% module directory (for M4)
echo --modpath5 print default %pkg% module directory (for M5)
echo --conds conditionals as set by configure
echo --help display this help and exit
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
