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

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

@@ -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
+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
+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))

CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars

@@ -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

CASA-auth-token/server/configure.in

@@ -22,7 +22,7 @@
 AC_INIT(CASA_auth_token_server, 1.7.795,,CASA_auth_token_server)
 AC_CONFIG_SRCDIR(autogen.sh)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(tar-pax)
+AM_INIT_AUTOMAKE(CASA_auth_token_server, 1.7.1547)
 RELEASE=`date +%Y%m%d_%H%M`
 AC_SUBST(RELEASE)
 AM_MAINTAINER_MODE
@@ -202,15 +202,34 @@ esac
 #
 # Check for IBM JVM
 #
-if test -d /usr/$LIB/jvm/jre-1.5.0
+JVM_LIBDIR=""
+JVM_LIB_THREAD=""
+if test -d /usr/$LIB/jvm/jre
 then
-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)
+test_bea_jvm=$(/usr/$LIB/jvm/jre/bin/java -version 2>&1 | grep -i jrockit)
   if test "$test_ibm_jvm" = ""
   then
-    # Assume Sun JVM
+    if test "$test_bea_jvm" = ""
-    JVM_VER=SUN
+      then
+      # Assume Sun JVM
+      JVM_VER=SUN
+    else
+      # Assume Bea JVM
+      JVM_VER=BEA
+    fi
   else
     JVM_VER=IBM
+    for i in /usr/$LIB/jvm/jre/lib/* /usr/$LIB/jvm/jre/bin ; do
+        test -d $i/classic || continue
+	JVM_LIBDIR=$i
+        break
+    done
+    for i in j9thr23 j9thr24 ; do
+	test -f $JVM_LIBDIR/lib$i.so || continue
+	JVM_LIB_THREAD="-l$i"
+	break
+    done
   fi
 else
   # Assume Sun JVM
@@ -218,7 +237,10 @@ else
 fi
 
 AC_SUBST(JVM_VER)
+AC_SUBST(JVM_LIBDIR)
+AC_SUBST(JVM_LIB_THREAD)
 AM_CONDITIONAL(IBM_JVM, test "$JVM_VER" = IBM)
+AM_CONDITIONAL(BEA_JVM, test "$JVM_VER" = BEA)
 
 
 #

CASA-auth-token/server/package/linux/CASA_auth_token_server.changes

@@ -3,6 +3,12 @@ Mon Aug 18 09:19:03 MDT 2008 - jluciani@novell.com
 
 - Removed BuildRequires dependency on insserv. 
 
+-------------------------------------------------------------------
+Thu Aug 14 14:35:31 CEST 2008 - ro@suse.de
+
+- use generic tag for java in buildrequires
+- try a little harder to find libjvm
+
 -------------------------------------------------------------------
 Thu Jun  5 10:44:58 MDT 2008 - jluciani@novell.com
 

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

@@ -15,7 +15,8 @@ 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 sysvinit pwdutils
+#BuildRequires:  CASA-devel apache2-devel expat gcc-c++ glib2-devel libstdc++ libstdc++-devel mono-devel pam-devel pkgconfig update-alternatives java-sdk >= 1.5 sysvinit pwdutils
+BuildRequires:  CASA-devel apache2-devel expat gcc-c++ glib2-devel insserv java-sdk >= 1.5 libstdc++ libstdc++-devel mono-devel pam-devel pkgconfig pwdutils sysvinit update-alternatives
 #%ifarch %ix86
 #BuildRequires:  java-1_5_0-ibm-alsa
 #%endif