From: Sam Ruby <rubys@php.net>
Date: Sun, 26 Mar 2000 04:31:53 +0000 (+0000)
Subject: JAVA_LIBPATH was not allways being added to the LIBPATH
X-Git-Tag: PHP-4.0-RC1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fcd82d34c5fbedbfb8ea03aa466baa737bb8df71;p=php

JAVA_LIBPATH was not allways being added to the LIBPATH
---

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 45de70a697..35d5a4e670 100644
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -39,7 +39,6 @@ AC_ARG_WITH(java,
       fi
 
     elif test -f $withval/lib/libjava.so; then
-      AC_ADD_LIBPATH($withval/lib)
       JAVA_LIB=java
       JAVA_LIBPATH=$withval/lib
       JAVA_INCLUDE="-I$withval/include"
@@ -66,7 +65,6 @@ AC_ARG_WITH(java,
 	if test -f $i/libjava.so; then 
           JAVA_LIB=java
           JAVA_LIBPATH=$i
-	  AC_ADD_LIBPATH($i)
 	  test -d $i/classic && AC_ADD_LIBPATH($i/classic)
 	  test -d $i/native_threads && AC_ADD_LIBPATH($i/native_threads)
 	fi
@@ -81,6 +79,7 @@ AC_ARG_WITH(java,
     fi
 
     AC_DEFINE(HAVE_JAVA,1,[ ])
+    AC_ADD_LIBPATH($JAVA_LIBPATH)
     JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/lib$JAVA_LIB.so\"'"
 
     if test "$PHP_SAPI" != "servlet"; then
diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index 45de70a697..35d5a4e670 100644
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -39,7 +39,6 @@ AC_ARG_WITH(java,
       fi
 
     elif test -f $withval/lib/libjava.so; then
-      AC_ADD_LIBPATH($withval/lib)
       JAVA_LIB=java
       JAVA_LIBPATH=$withval/lib
       JAVA_INCLUDE="-I$withval/include"
@@ -66,7 +65,6 @@ AC_ARG_WITH(java,
 	if test -f $i/libjava.so; then 
           JAVA_LIB=java
           JAVA_LIBPATH=$i
-	  AC_ADD_LIBPATH($i)
 	  test -d $i/classic && AC_ADD_LIBPATH($i/classic)
 	  test -d $i/native_threads && AC_ADD_LIBPATH($i/native_threads)
 	fi
@@ -81,6 +79,7 @@ AC_ARG_WITH(java,
     fi
 
     AC_DEFINE(HAVE_JAVA,1,[ ])
+    AC_ADD_LIBPATH($JAVA_LIBPATH)
     JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/lib$JAVA_LIB.so\"'"
 
     if test "$PHP_SAPI" != "servlet"; then