From 2ee197b4c6b2548a29e0bd9a6a0770f2c54a8fc2 Mon Sep 17 00:00:00 2001
From: Sascha Schumann <sas@php.net>
Date: Mon, 10 Sep 2001 16:59:31 +0000
Subject: [PATCH] Fix a problem when withval pointed to a symlink and automatic
 detection for the java libraries failed

---
 ext/java/config.m4     | 7 +++++--
 ext/rpc/java/config.m4 | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 34aa68a27fb..40b9a6f827b 100644
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -54,7 +54,7 @@ AC_ARG_WITH(java,
       test -f $withval/lib/classes.zip && JAVA_CLASSPATH=$withval/lib/classes.zip
       test -f $withval/lib/jvm.jar     && JAVA_CLASSPATH=$withval/lib/jvm.jar
       for i in $JAVA_INCLUDE/*; do
-	test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i"
+        test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i"
       done
 
     else
@@ -64,7 +64,7 @@ AC_ARG_WITH(java,
         test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i"
       done
 
-      for i in `find $withval -type d`; do
+      for i in `find $withval/. -type d`; do
         test -f $i/classes.zip && JAVA_CFLAGS=-DJNI_11
         test -f $i/rt.jar      && JAVA_CFLAGS=-DJNI_12
         test -f $i/classes.zip && JAVA_CLASSPATH=$i/classes.zip
@@ -89,6 +89,9 @@ AC_ARG_WITH(java,
     fi
 
     AC_DEFINE(HAVE_JAVA,1,[ ])
+    if test -z "$JAVA_LIBPATH"; then
+      AC_MSG_ERROR(unable to find Java VM libraries)
+    fi
     PHP_ADD_LIBPATH($JAVA_LIBPATH)
     JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"
 
diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index 34aa68a27fb..40b9a6f827b 100644
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -54,7 +54,7 @@ AC_ARG_WITH(java,
       test -f $withval/lib/classes.zip && JAVA_CLASSPATH=$withval/lib/classes.zip
       test -f $withval/lib/jvm.jar     && JAVA_CLASSPATH=$withval/lib/jvm.jar
       for i in $JAVA_INCLUDE/*; do
-	test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i"
+        test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i"
       done
 
     else
@@ -64,7 +64,7 @@ AC_ARG_WITH(java,
         test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i"
       done
 
-      for i in `find $withval -type d`; do
+      for i in `find $withval/. -type d`; do
         test -f $i/classes.zip && JAVA_CFLAGS=-DJNI_11
         test -f $i/rt.jar      && JAVA_CFLAGS=-DJNI_12
         test -f $i/classes.zip && JAVA_CLASSPATH=$i/classes.zip
@@ -89,6 +89,9 @@ AC_ARG_WITH(java,
     fi
 
     AC_DEFINE(HAVE_JAVA,1,[ ])
+    if test -z "$JAVA_LIBPATH"; then
+      AC_MSG_ERROR(unable to find Java VM libraries)
+    fi
     PHP_ADD_LIBPATH($JAVA_LIBPATH)
     JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"