CVS: moonbase/devel/db4 DETAILS,1.5,1.6 CONFIGURE,1.3,1.4

[Terry Chan]

Update of /var/cvs/lunar/moonbase/devel/db4
In directory dbguin.lunar-linux.org:/tmp/cvs-serv22467

Modified Files:
	DETAILS CONFIGURE 
Log Message:
I had to revert db4 back down to 4.1.25.  4.2.52 will not work correctly
with --enable-java and blackdown j2sdk.  It errors out during ./configure
with: 

checking if java works... configure: error: The Java VM java failed (see config.log, check the CLASSPATH?)

So if anyone bumps db4 back above 4.1.25, they have to fix the java problem first!

I've fixed the Lunar CONFIGURE script to correctly pass the --enable-java flag
in the $OPTS var.  $OPTS if set in CONFIGURE, MUST be echoed out to
$MODULE_CONFIG, otherwise the lunar core will just unset the OPTS var
in satisfy_depends (depends.lunar).

db4 4.1.25 correctly compiles with java enabled and tested with gcc-3.2.3,
glibc-2.3.2.


Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/devel/db4/DETAILS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DETAILS	20 Dec 2003 08:53:37 -0000	1.5
+++ DETAILS	28 Dec 2003 08:53:53 -0000	1.6
@@ -1,14 +1,14 @@
           MODULE=db4
-         VERSION=4.2.52
-        #VERSION=4.2.50
+         VERSION=4.1.25
+        #VERSION=4.2.52
           SOURCE=db-$VERSION.tar.gz
+         SOURCE2=patch.4.1.25.1 
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/db-$VERSION
    SOURCE_URL[0]=http://www.sleepycat.com/update/snapshot/$SOURCE
-     SOURCE_VFY=md5:cbc77517c9278cdb47613ce8cb55779f
+  SOURCE2_URL[0]=http://www.sleepycat.com/update/$VERSION/$SOURCE2
         WEB_SITE=http://www.sleepycat.com/
          ENTERED=20020318
-         UPDATED=20031220
-      MAINTAINER="jacksonje at health.missouri.edu"
+         UPDATED=20031228
            SHORT="Berkley DB provides database support."
 cat << EOF
 Berkeley DB is a programmatic toolkit that provides fast, reliable,

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/devel/db4/CONFIGURE,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CONFIGURE	26 Nov 2003 17:59:45 -0000	1.3
+++ CONFIGURE	28 Dec 2003 08:53:53 -0000	1.4
@@ -1,9 +1,13 @@
-if query "Enable java support?" y  ; then
-  if ! module_installed j2sdk; then
-    lin j2sdk
+if ! grep -q "CONFIG_JAVA="  $MODULE_CONFIG; then
+  if query "Enable java support?" n  ; then
+    if ! module_installed j2sdk; then
+      lin j2sdk
+    fi
+    echo 'OPTS="$OPTS --enable-java"' > $MODULE_CONFIG
+    CONFIG_JAVA=y
+  else
+    CONFIG_JAVA=n
   fi
-  OPTS=$OPTS" --enable-java"
+  echo "CONFIG_JAVA=$CONFIG_JAVA" >> $MODULE_CONFIG
 fi
 
-
-