Update of /cvsroot/monetdb/geom/conf
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv540/geom/conf

Modified Files:
        monetdb-geom-config.bat.in monetdb-geom-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-geom-config.in
Index: monetdb-geom-config.in
===================================================================
RCS file: /cvsroot/monetdb/geom/conf/monetdb-geom-config.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- monetdb-geom-config.in      10 Oct 2008 08:47:47 -0000      1.5
+++ monetdb-geom-config.in      29 Oct 2008 18:51:59 -0000      1.6
@@ -26,7 +26,6 @@
 exec_prefix="@Qexec_prefix@"
 
 libdir="@Qlibdir@"
-M4libdir="${libdir}/MonetDB4"
 M5libdir="${libdir}/MonetDB5"
 
 usage()
@@ -38,7 +37,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
@@ -75,10 +73,6 @@
        echo $source
        ;;
 
-    --modpath4)
-        echo   $M4libdir:$M4libdir/lib:$M4libdir/bin
-        ;;
-
     --modpath5)
         echo   $M5libdir:$M5libdir/lib:$M5libdir/bin
         ;;
@@ -93,7 +87,6 @@
        echo [EMAIL PROTECTED]@
        echo [EMAIL PROTECTED]@
        echo [EMAIL PROTECTED]@
-       echo [EMAIL PROTECTED]@
        echo [EMAIL PROTECTED]@
        echo [EMAIL PROTECTED]@
        echo [EMAIL PROTECTED]@

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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- monetdb-geom-config.bat.in  24 Jul 2008 21:45:36 -0000      1.5
+++ monetdb-geom-config.bat.in  29 Oct 2008 18:51:59 -0000      1.6
@@ -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%
 
 if "%1" == ""  goto usage
@@ -29,7 +27,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 not "%1" == "--conds"       goto usage
 
@@ -39,7 +36,6 @@
        echo [EMAIL PROTECTED]@
        echo [EMAIL PROTECTED]@
        echo [EMAIL PROTECTED]@
-       echo [EMAIL PROTECTED]@
        echo [EMAIL PROTECTED]@
        echo [EMAIL PROTECTED]@
        echo [EMAIL PROTECTED]@
@@ -69,7 +65,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


-------------------------------------------------------------------------
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

Reply via email to