Fixed build problem on SLES10 distro.
-This line, and those below, will be ignored-- M server/configure.in M server/autogen.sh
This commit is contained in:
parent
fec50fc5f3
commit
7b18319169
@ -4,14 +4,6 @@
|
|||||||
srcdir=`dirname $0`
|
srcdir=`dirname $0`
|
||||||
test -z "$srcdir" && srcdir=.
|
test -z "$srcdir" && srcdir=.
|
||||||
|
|
||||||
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
|
|
||||||
else
|
|
||||||
jvm_ver=ibm
|
|
||||||
fi
|
|
||||||
|
|
||||||
ORIGDIR=`pwd`
|
ORIGDIR=`pwd`
|
||||||
cd $srcdir
|
cd $srcdir
|
||||||
PROJECT=CASA_auth_token_server
|
PROJECT=CASA_auth_token_server
|
||||||
|
@ -202,14 +202,16 @@ esac
|
|||||||
#
|
#
|
||||||
# Check for IBM JVM
|
# Check for IBM JVM
|
||||||
#
|
#
|
||||||
case $jvm_ver in
|
test_ibm_jvm=$(/usr/lib/jvm/jre-1.5.0/bin/java -version 2>&1 | grep -i ibm)
|
||||||
sun*)
|
if test "$test_ibm_jvm" = ""
|
||||||
|
then
|
||||||
|
# Assume Sun JVM
|
||||||
JVM_VER=SUN
|
JVM_VER=SUN
|
||||||
;;
|
echo "SUN_JVM test_ibm_jvm=$test_ibm_jvm"
|
||||||
ibm*)
|
else
|
||||||
JVM_VER=IBM
|
JVM_VER=IBM
|
||||||
;;
|
echo "IBM_JVM test_ibm_jvm=$test_ibm_jvm"
|
||||||
esac
|
fi
|
||||||
AC_SUBST(JVM_VER)
|
AC_SUBST(JVM_VER)
|
||||||
AM_CONDITIONAL(IBM_JVM, test "$JVM_VER" = IBM)
|
AM_CONDITIONAL(IBM_JVM, test "$JVM_VER" = IBM)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user