cvs: /php4/ext/java config.m4

rubys Sat Mar 25 20:32:22 2000 EDT Modified files: /php4/ext/java config.m4 Log: JAVA_LIBPATH was not allways being added to the LIBPATH Index: php4/ext/java/config.m4 diff -u php4/ext/java/config.m4:1.15 php4/ext/java/config.m4:1.16 --- php4/ext/java/config.m4:1.15 Sat Mar 25 07:57:03 2000 +++ php4/ext/java/config.m4 Sat Mar 25 20:31:52 2000 @@ -1,4 +1,4 @@ -# $Id: config.m4,v 1.15 2000/03/25 15:57:03 rubys Exp $ +# $Id: config.m4,v 1.16 2000/03/26 04:31:52 rubys Exp $ # config.m4 for extension java AC_MSG_CHECKING(for Java support) @@ -39,7 +39,6 @@ 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 @@ 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 @@ 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