From 4df11cd9304aac5e6412b262cf42a8df6adc0528 Mon Sep 17 00:00:00 2001
From: Juan Carlos Luciani <jluciani@novell.com>
Date: Wed, 29 Nov 2006 04:20:37 +0000
Subject: [PATCH] More changes to try to resolve 64bit platform build issues.

---
 .../server/AuthTokenValidate/Svc/linux/Makefile.am        | 8 +++++++-
 .../server/AuthTokenValidate/Svc/linux/envvars            | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am
index bdb2163d..92cd9b12 100644
--- a/CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am
+++ b/CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am
@@ -42,7 +42,13 @@ LIBDIR = $(ROOT)/$(LIB)
 BINDIR = $(ROOT)/$(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
 
 # handle Mono secondary dependencies
diff --git a/CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars b/CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars
index 2e102d0e..c546f9d7 100644
--- a/CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars
+++ b/CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars
@@ -32,15 +32,17 @@
 ############################################################
 if [ -d /usr/lib64 ]; then
   LIB=lib64
+  SUNLIBDIR=amd64
 else
   LIB=lib
+  SUNLIBDIR=i386
 fi
 
 TEST_IBM_JVM=$(/usr/$LIB/jvm/jre-1.5.0/bin/java -version 2>&1 | grep -i ibm)
 if [ -z "${TEST_IBM_JVM}" ]; then
   # Assume Sun JVM
   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
   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