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

casa-auth-token-server: check in the changes by german autobuild team

Browse Source
This commit is contained in:
soochoi
2008-08-19 16:23:19 +00:00
parent 01a4554a4b
commit bebe2d19f3
5 changed files with 61 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,9 @@ LIBDIR = $(ROOT)/$(LIB)
BINDIR = $(ROOT)/$(BIN)
IBM_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/bin
IBM_JAVA_XLIBDIR = @JVM_LIBDIR@
IBM_JAVA_THREAD = @JVM_LIB_THREAD@
BEA_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/lib/ia64/jrockit
if LIB64
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/lib/amd64/server
@@ -72,12 +75,17 @@ CFLAGS += -Wno-format-extra-args -fno-strict-aliasing $(INCLUDES) $(DEFINES)
CPPFLAGS += -Wno-format-extra-args -fno-strict-aliasing -fPIC $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
if IBM_JVM
LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig -lj9thr23 -ldl
LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(IBM_JAVA_LIBDIR) -L$(IBM_JAVA_LIBDIR)/classic
LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig $(IBM_JAVA_THREAD) -ldl
LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(IBM_JAVA_LIBDIR) -L$(IBM_JAVA_LIBDIR)/classic -L$(IBM_JAVA_XLIBDIR)
else
if BEA_JVM
LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig -ldl
LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(BEA_JAVA_LIBDIR)
else
LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig -ldl
LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(SUN_JAVA_LIBDIR)
endif
endif
OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) $(addprefix $(OBJDIR)/, $(CPPFILES:%.cpp=%.o))

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

@@ -39,7 +39,8 @@ else
fi
TEST_IBM_JVM=$(/usr/$LIB/jvm/jre/bin/java -version 2>&1 | grep -i ibm)
if [ -z "${TEST_IBM_JVM}" ]; then
TEST_BEA_JVM=$(/usr/$LIB/jvm/jre/bin/java -version 2>&1 | grep -i jrockit)
if [ -z "${TEST_IBM_JVM}" -a -z "${TEST_BEA_JVM}" ]; then
# Assume Sun JVM
JVM_VER=SUN
if [ -z "${LD_LIBRARY_PATH}" ]; then
@@ -47,12 +48,24 @@ if [ -z "${TEST_IBM_JVM}" ]; then
else
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre/lib/$SUNLIBDIR/server
fi
elif [ -z "${TEST_BEA_JVM}" ]; then
# Assume BEA JVM
JVM_VER=BEA
if [ -z "${LD_LIBRARY_PATH}" ]; then
LD_LIBRARY_PATH=/usr/$LIB/jvm/jre/lib/ia64/jrockit
else
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre/lib/ia64/jrockit
fi
else
JVM_VER=IBM
for i in /usr/$LIB/jvm/jre/lib/* /usr/$LIB/jvm/jre/bin ; do
test -d $i/classic || continue
break
done
if [ -z "${LD_LIBRARY_PATH}" ]; then
LD_LIBRARY_PATH=/usr/$LIB/jvm/jre/bin:/usr/$LIB/jvm/jre/bin/classic
LD_LIBRARY_PATH=$i:$i/classic
else
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre/bin:/usr/$LIB/jvm/jre/bin/classic
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":$i:$i/classic
fi
fi
export JVM_VER