Changeset 8

Timestamp:

Aug 11, 2010, 3:26:51 PM (14 years ago)

Author:

djay

Message:

Simple update configure.ac and Makefile.in to remove the uneeded link against javaplugin_jni library and to remove the build of service_loader command line tool (as now ZOO Kernel can be run from command line directly). The javaplugin_jni link worked well this way on Gentoo Linux but didn't on the OSGeo-LiveDVD. We made tests on OSGeo-LiveDVD and it worked fine with java services provider when removing this dependency and adding the path of the jvm library to the /etc/ld.so.conf file.

Location:

trunk/zoo-kernel

Files:

• Makefile.in (modified) (1 diff)
• configure.ac (modified) (1 diff)

trunk/zoo-kernel/Makefile.in

@@ -20 +20 @@
 
 
-all: zoo_loader.cgi service_loader
+all: zoo_loader.cgi
 
 main_conf_read.tab.c: main_conf_read.y service.h

trunk/zoo-kernel/configure.ac

@@ -281 +281 @@
         if test -d "$JDKHOME/jre/lib/i386";
         then
-                JAVA_LDFLAGS="-L$JDKHOME/jre/lib/i386/ -ljavaplugin_jni -L$JDKHOME/jre/lib/i386/server/ -ljvm -lpthread"
+                JAVA_LDFLAGS="-L$JDKHOME/jre/lib/i386/server/ -ljvm -lpthread"
                 JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
         else
-                JAVA_LDFLAGS="-L$JDKHOME/jre/lib/amd64/ -ljavaplugin_jni -L$JDKHOME/jre/lib/amd64/server/ -ljvm -lpthread"
+                JAVA_LDFLAGS="-L$JDKHOME/jre/lib/amd64/server/ -ljvm -lpthread"
                 JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
         fi