Update of /cvsroot/monetdb/sql/conf
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv540/sql/conf
Modified Files:
monetdb-sql-config.bat.in monetdb-sql-config.in
Log Message:
Since SQL & GEOM do no longer support the MonetDB4 back-end,
we clean up the code base by removing all MonetDB4-related "legacy"
from the SQL & GEOM repositories.
For convenience, the changes are wrapped in CVS tags
"with_MonetDB4" & "without_MonetDB4".
U monetdb-sql-config.bat.in
Index: monetdb-sql-config.bat.in
===================================================================
RCS file: /cvsroot/monetdb/sql/conf/monetdb-sql-config.bat.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- monetdb-sql-config.bat.in 24 Jul 2008 21:45:37 -0000 1.10
+++ monetdb-sql-config.bat.in 29 Oct 2008 18:51:56 -0000 1.11
@@ -11,9 +11,7 @@
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
-set M4libdir=%libdir%\MonetDB4
set M5libdir=%libdir%\MonetDB5
-set modpath4=%M4libdir%
set modpath5=%M5libdir%
set [EMAIL PROTECTED]@
@@ -30,7 +28,6 @@
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 "%1" == "--pythonlibdir" echo %pythonlibdir%& goto shift
if "%1" == "--internal" goto shift
@@ -43,7 +40,6 @@
echo [EMAIL PROTECTED]@
echo [EMAIL PROTECTED]@
echo [EMAIL PROTECTED]@
- echo [EMAIL PROTECTED]@
echo [EMAIL PROTECTED]@
echo [EMAIL PROTECTED]@
echo [EMAIL PROTECTED]@
@@ -73,7 +69,6 @@
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
U monetdb-sql-config.in
Index: monetdb-sql-config.in
===================================================================
RCS file: /cvsroot/monetdb/sql/conf/monetdb-sql-config.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- monetdb-sql-config.in 10 Oct 2008 08:53:03 -0000 1.9
+++ monetdb-sql-config.in 29 Oct 2008 18:51:56 -0000 1.10
@@ -27,9 +27,7 @@
libdir="@Qlibdir@"
incdir="@Qincludedir@"
-M4libdir="${libdir}/MonetDB4"
M5libdir="${libdir}/MonetDB5"
-M4incdir="${incdir}/MonetDB4"
M5incdir="${incdir}/MonetDB5"
pythonlibdir="${prefix}/@PYTHON_LIBDIR@"
@@ -42,7 +40,6 @@
--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
@@ -79,10 +76,6 @@
echo $source
;;
- --modpath4)
- echo $M4libdir:$M4libdir/lib:$M4libdir/bin
- ;;
-
--modpath5|--modpath)
echo $M5libdir:$M5libdir/lib:$M5libdir/bin
;;
@@ -99,18 +92,10 @@
usage 0
;;
- --cflags4)
- echo -I$M4incdir/sql
- ;;
-
--cflags5|--cflags)
echo -I$M5incdir/sql
;;
- --libs4)
- echo -L$M4libdir/lib
- ;;
-
--libs5|--libs)
echo -L$M5libdir/lib
;;
@@ -122,7 +107,6 @@
echo [EMAIL PROTECTED]@
echo [EMAIL PROTECTED]@
echo [EMAIL PROTECTED]@
- echo [EMAIL PROTECTED]@
echo [EMAIL PROTECTED]@
echo [EMAIL PROTECTED]@
echo [EMAIL PROTECTED]@
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
