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

Fixed some 64bit platform build issues.

Browse Source 
-omhis line, and those below, will be ignored--

M    server/configure.in
M    server/package/linux/CASA_auth_token_server.changes
M    server/package/linux/CASA_auth_token_server.spec.in
M    server/AuthTokenValidate/Svc/linux/envvars
M    server/AuthTokenValidate/Svc/linux/Makefile.am
This commit is contained in:
Juan Carlos Luciani 2006-11-28 11:47:04 +00:00
parent ee795f0f41
commit 00cffb071c
5 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,9 +41,9 @@ ROOT = ../../..
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
JAVA_INCDIR = /usr/lib/jvm/java-1.5.0/include
IBM_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/bin
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/lib/$(HOSTTYPE)/server
JAVA_INCDIR = /usr/$(LIB)/jvm/java-1.5.0/include
# handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH)

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

@ -25,19 +25,25 @@
# is only meaningful when the auto-restart daemon #
# feature mentioned above is enabled. Core dumps are #
# allowed to be taken when the auto-restart daemon #
# feature is disabled. Core dumps of novell-xsrvd #
# service processes are taken to the #
# /var/novell/xtier folder. #
# feature is disabled. Core dumps of casa_atvd service #
# processes are taken to the #
# /var/lib/CASA/authtoken/validate folder. #
# #
############################################################
TEST_IBM_JVM=$(/usr/lib/jvm/jre-1.5.0/bin/java -version 2>&1 | grep -i ibm)
if [ -d /usr/lib64 ]; then
LIB=lib64
else
LIB=lib
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/$HOSTTYPE/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
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre-1.5.0/bin:/usr/$LIB/jvm/jre-1.5.0/bin/classic
fi
export JVM_VER
export LD_LIBRARY_PATH

4
CASA-auth-token/server/configure.in
View File

@ -202,15 +202,13 @@ esac
#
# Check for IBM JVM
#
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 test "$test_ibm_jvm" = ""
then
# Assume Sun JVM
JVM_VER=SUN
echo "SUN_JVM test_ibm_jvm=$test_ibm_jvm"
else
JVM_VER=IBM
echo "IBM_JVM test_ibm_jvm=$test_ibm_jvm"
fi
AC_SUBST(JVM_VER)
AM_CONDITIONAL(IBM_JVM, test "$JVM_VER" = IBM)

6
CASA-auth-token/server/package/linux/CASA_auth_token_server.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Nov 28 16:11:36 MST 2006 - jluciani@novell.com
- Fixed 64-bit platform problems introduced while addressing
bugs: BUG222541, BUG216949, BUG215221.
-------------------------------------------------------------------
Wed Nov 22 08:45:06 MST 2006 - jluciani@novell.com

2
CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in
View File

@ -15,7 +15,7 @@ Name: CASA_auth_token_server
%define debug_opt ""
URL: http://www.novell.com/products
BuildRequires: CASA-devel apache2-devel expat gcc-c++ glib2-devel libstdc++ libstdc++-devel mono-devel pam-devel pkgconfig update-alternatives java-sdk-1.5.0 sysvinit insserv glade-sharp glade-sharp2
BuildRequires: CASA-devel apache2-devel expat gcc-c++ glib2-devel libstdc++ libstdc++-devel mono-devel pam-devel pkgconfig update-alternatives java-sdk-1.5.0 sysvinit insserv glade-sharp glade-sharp2
%define prefix /usr
License: LGPL
Group: System/Libraries