Update of /cvsroot/monetdb/sql/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21965/sql/conf
Modified Files:
Tag: SQL_2-20
monetdb-sql-config.in monetdb-sql-config.bat.in
Log Message:
for testing in case sql uses a different prefix than MonetDB and/or clients:
added "--pythonlibdir" option to monetdb-sql-config to find sql-provided python
modules
in case sql uses a different prefix than MonetDB and/or clients
Index: monetdb-sql-config.bat.in
===================================================================
RCS file: /cvsroot/monetdb/sql/conf/monetdb-sql-config.bat.in,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- monetdb-sql-config.bat.in 3 Oct 2007 13:28:56 -0000 1.6.2.1
+++ monetdb-sql-config.bat.in 28 Oct 2007 10:48:47 -0000 1.6.2.2
@@ -15,6 +15,7 @@
set M5libdir=%libdir%\MonetDB5
set modpath4=%M4libdir%
set modpath5=%M5libdir%
+set [EMAIL PROTECTED]@
if "%1" == "" goto usage
@@ -31,6 +32,7 @@
if "%1" == "--prefix" echo %prefix% & goto shift
if "%1" == "--modpath4" echo %modpath4% & goto shift
if "%1" == "--modpath5" echo %modpath5% & goto shift
+if "%1" == "--pythonlibdir" echo %pythonlibdir% & goto shift
if "%1" == "--internal" goto shift
:usage
@@ -46,6 +48,6 @@
echo --help display this help and exit
echo.
echo Install directories %pkg% was configured to
- echo --prefix
+ echo --prefix --pythonlibdir
echo.
Index: monetdb-sql-config.in
===================================================================
RCS file: /cvsroot/monetdb/sql/conf/monetdb-sql-config.in,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- monetdb-sql-config.in 13 Sep 2007 22:39:35 -0000 1.4
+++ monetdb-sql-config.in 28 Oct 2007 10:48:46 -0000 1.4.2.1
@@ -27,6 +27,7 @@
libdir="@Qlibdir@"
M4libdir="${libdir}/MonetDB4"
M5libdir="${libdir}/MonetDB5"
+pythonlibdir="${prefix}/@PYTHON_LIBDIR@"
usage()
{
@@ -42,7 +43,7 @@
--help display this help and exit
Install directories ${pkg} was configured to
- --prefix
+ --prefix --pythonlibdir
EOF
@@ -81,6 +82,14 @@
echo $M5libdir:$M5libdir/lib:$M5libdir/bin
;;
+ --*dir)
+ dirname=\$`echo $1 | sed -e 's,^--,,'`
+ dirname=`eval echo $dirname`
+ test -z "$dirname" && exit 1
+ echo $dirname
+ exit 0
+ ;;
+
--help)
usage 0
;;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
