Update of /cvsroot/monetdb/java/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23769/java/conf
Modified Files:
monetdb-java-config.bat.in monetdb-java-config.in
Log Message:
conditional "HAVE_MONETDB_JAVA" is no longer sufficient to determine
whether Java/JDBC test can/should be run or not;
hence, we introduce more specific conditionals
"HAVE_MONETDB_JAVAJDBC" & "HAVE_MONETDB_JAVAXRPC" also for testing
and extend monetdb-java-config with options
"--HAVE_MONETDB_JAVAJDBC" & "--HAVE_MONETDB_JAVAXRPC"
to convey the information to other packages
Index: monetdb-java-config.in
===================================================================
RCS file: /cvsroot/monetdb/java/conf/monetdb-java-config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- monetdb-java-config.in 28 Nov 2007 16:23:57 -0000 1.2
+++ monetdb-java-config.in 11 Dec 2007 22:19:06 -0000 1.3
@@ -27,6 +27,9 @@
datadir="@Qdatadir@"
pkgdatadir="${datadir}/MonetDB"
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
usage()
{
cat <<EOF
@@ -34,10 +37,12 @@
Known values for OPTION are:
- --build print ${pkg} build directory
- --source print ${pkg} source directory
- --help display this help and exit
- --version output version information
+ --build print ${pkg} build directory
+ --source print ${pkg} source directory
+ --help display this help and exit
+ --version output version information
+ --HAVE_MONETDB_JAVAJDBC "#" in case JDBC is available, "" otherwise
+ --HAVE_MONETDB_JAVAXRPC "#" in case XRPCwrapper is available, ""
otherwise
Install directories ${pkg} was configured to
--prefix --exec-prefix --bindir
@@ -92,6 +97,13 @@
exit 0
;;
+ --HAVE_MONETDB_JAVA*C)
+ condname=\$`echo $1 | sed -e 's,^--,,'`
+ condname=`eval echo $condname`
+ test -n "$condname" && echo $condname
+ exit 0
+ ;;
+
--help)
usage 0
;;
Index: monetdb-java-config.bat.in
===================================================================
RCS file: /cvsroot/monetdb/java/conf/monetdb-java-config.bat.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- monetdb-java-config.bat.in 11 Dec 2007 16:25:30 -0000 1.3
+++ monetdb-java-config.bat.in 11 Dec 2007 22:19:06 -0000 1.4
@@ -14,6 +14,10 @@
set [EMAIL PROTECTED]@
set pkgdatadir=%datadir%\MonetDB
+set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
+
if "%1" == "" goto usage
goto case
@@ -33,6 +37,8 @@
if "%1" == "--datarootdir" echo %datarootdir%& goto shift
if "%1" == "--datadir" echo %datadir%& goto shift
if "%1" == "--pkgdatadir" echo %pkgdatadir%& goto shift
+if "%1" == "--HAVE_MONETDB_JAVAJDBC" echo %HAVE_MONETDB_JAVAJDBC%& goto
shift
+if "%1" == "--HAVE_MONETDB_JAVAXRPC" echo %HAVE_MONETDB_JAVAXRPC%& goto
shift
if "%1" == "--internal" goto shift
:usage
@@ -41,10 +47,12 @@
echo.
echo Known values for OPTION are:
echo.
- echo --build print %pkg% build directory
- echo --source print %pkg% source directory
- echo --help display this help and exit
- echo --version output version information
+ echo --build print %pkg% build directory
+ echo --source print %pkg% source directory
+ echo --help display this help and exit
+ echo --version output version information
+ echo --HAVE_MONETDB_JAVAJDBC "#" in case JDBC is available, ""
otherwise
+ echo --HAVE_MONETDB_JAVAXRPC "#" in case XRPCwrapper is available,
"" otherwise
echo.
echo Install directories %pkg% was configured to
echo --prefix --exec-prefix --bindir
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
