geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More changes to try to resolve 64bit platform build issues.

Browse Source
This commit is contained in:
Juan Carlos Luciani 2006-11-29 04:20:37 +00:00
parent 00cffb071c
commit 4df11cd930
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am
View File

@ -42,7 +42,13 @@ LIBDIR = $(ROOT)/$(LIB)
BINDIR = $(ROOT)/$(BIN) BINDIR = $(ROOT)/$(BIN)
IBM_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/bin IBM_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/bin
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/lib/$(HOSTTYPE)/server
if LIB64
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/lib/amd64/server
else
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/lib/i386/server
endif
JAVA_INCDIR = /usr/$(LIB)/jvm/java-1.5.0/include JAVA_INCDIR = /usr/$(LIB)/jvm/java-1.5.0/include
# handle Mono secondary dependencies # handle Mono secondary dependencies

4
CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars
View File

@ -32,15 +32,17 @@
############################################################ ############################################################
if [ -d /usr/lib64 ]; then if [ -d /usr/lib64 ]; then
LIB=lib64 LIB=lib64
SUNLIBDIR=amd64
else else
LIB=lib LIB=lib
SUNLIBDIR=i386
fi fi
TEST_IBM_JVM=$(/usr/$LIB/jvm/jre-1.5.0/bin/java -version 2>&1 | grep -i ibm) TEST_IBM_JVM=$(/usr/$LIB/jvm/jre-1.5.0/bin/java -version 2>&1 | grep -i ibm)
if [ -z "${TEST_IBM_JVM}" ]; then if [ -z "${TEST_IBM_JVM}" ]; then
# Assume Sun JVM # Assume Sun JVM
JVM_VER=SUN JVM_VER=SUN
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre-1.5.0/lib/$HOSTTYPE/server LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre-1.5.0/lib/$SUNLIBDIR/server
else else
JVM_VER=IBM JVM_VER=IBM
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre-1.5.0/bin:/usr/$LIB/jvm/jre-1.5.0/bin/classic LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre-1.5.0/bin:/usr/$LIB/jvm/jre-1.5.0/bin/classic