From 7b183191691ed6c1d16b3d041c1add0ade34bd87 Mon Sep 17 00:00:00 2001
From: Juan Carlos Luciani <jluciani@novell.com>
Date: Mon, 20 Nov 2006 06:15:24 +0000
Subject: [PATCH] Fixed build problem on SLES10 distro.

-This line, and those below, will be ignored--

M    server/configure.in
M    server/autogen.sh
---
 CASA-auth-token/server/autogen.sh   |  8 --------
 CASA-auth-token/server/configure.in | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/CASA-auth-token/server/autogen.sh b/CASA-auth-token/server/autogen.sh
index a4db92b0..ccddb249 100755
--- a/CASA-auth-token/server/autogen.sh
+++ b/CASA-auth-token/server/autogen.sh
@@ -4,14 +4,6 @@
 srcdir=`dirname $0`
 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`
 cd $srcdir
 PROJECT=CASA_auth_token_server
diff --git a/CASA-auth-token/server/configure.in b/CASA-auth-token/server/configure.in
index 0f3e26f9..eb011e68 100644
--- a/CASA-auth-token/server/configure.in
+++ b/CASA-auth-token/server/configure.in
@@ -202,14 +202,16 @@ esac
 #
 # Check for IBM JVM
 #
-case $jvm_ver in
-   sun*)
-    JVM_VER=SUN
-   ;;
-   ibm*)
-    JVM_VER=IBM
-   ;;
-esac
+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)