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

Fixed issues that were keeping the component from building on STABLE.

Browse Source 
Also made necessary changes to the spec files as recommended by
autobuild and to conform with the spec file on STABLE.
This commit is contained in:
Juan Carlos Luciani
2008-06-03 16:01:53 +00:00
parent df9110cfec
commit 268046b8ee
5 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,9 +16,9 @@
### BEGIN INIT INFO
# Provides: casa_atvd
# Required-Start: $local_fs $remote_fs
# X-UnitedLinux-Should-Start: $syslog $time
# Should-Start: $syslog $time
# Required-Stop: $local_fs $remote_fs
# X-UnitedLinux-Should-Stop: $syslog $time
# Should-Stop: $syslog $time
# Default-Start: 2 3 5
# Default-Stop:
# Short-Description: Casa Authtoken Validate Daemon

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

@@ -41,15 +41,15 @@ ROOT = ../../..
LIBDIR = $(ROOT)/$(LIB)
BINDIR = $(ROOT)/$(BIN)
IBM_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/bin
IBM_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/bin
if LIB64
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/lib/amd64/server
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/lib/amd64/server
else
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/lib/i386/server
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/lib/i386/server
endif
JAVA_INCDIR = /usr/$(LIB)/jvm/java-1.5.0/include
JAVA_INCDIR = /usr/$(LIB)/jvm/java/include
# handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH)

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

@@ -38,21 +38,21 @@ else
SUNLIBDIR=i386
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/bin/java -version 2>&1 | grep -i ibm)
if [ -z "${TEST_IBM_JVM}" ]; then
# Assume Sun JVM
JVM_VER=SUN
if [ -z "${LD_LIBRARY_PATH}" ]; then
LD_LIBRARY_PATH=/usr/$LIB/jvm/jre-1.5.0/lib/$SUNLIBDIR/server
LD_LIBRARY_PATH=/usr/$LIB/jvm/jre/lib/$SUNLIBDIR/server
else
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre-1.5.0/lib/$SUNLIBDIR/server
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre/lib/$SUNLIBDIR/server
fi
else
JVM_VER=IBM
if [ -z "${LD_LIBRARY_PATH}" ]; then
LD_LIBRARY_PATH=/usr/$LIB/jvm/jre-1.5.0/bin:/usr/$LIB/jvm/jre-1.5.0/bin/classic
LD_LIBRARY_PATH=/usr/$LIB/jvm/jre/bin:/usr/$LIB/jvm/jre/bin/classic
else
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/bin:/usr/$LIB/jvm/jre/bin/classic
fi
fi
export JVM_VER

1
CASA-auth-token/server/AuthTokenValidate/Svc/linux/internal.h
View File

@@ -49,6 +49,7 @@ extern "C" {
#include <sys/stat.h>
#include <sys/file.h>
#include <assert.h> // Ensure that NDEBUG is defined for release builds!
#include <limits.h>
#include <sys/ipc.h>
#include <casa_s_ipc.h>
}