cvs: php4 /ext/java config.m4 java.c

kalowsky Tue Aug 20 21:41:21 2002 EDT Modified files: /php4/ext/java config.m4 java.c Log: One more patch up towards OSX compatibility... # it compiles now with the ObjC files (Finlay Doobie rocks the casbah) Index: php4/ext/java/config.m4 diff -u php4/ext/java/config.m4:1.45 php4/ext/java/config.m4:1.46 --- php4/ext/java/config.m4:1.45 Mon Aug 19 17:49:36 2002 +++ php4/ext/java/config.m4 Tue Aug 20 21:41:21 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.45 2002/08/19 21:49:36 sniper Exp $ +dnl $Id: config.m4,v 1.46 2002/08/21 01:41:21 kalowsky Exp $ dnl AC_DEFUN(JAVA_FIND_JAR, [ AC_MSG_CHECKING([Java Jar location]) @@ -18,9 +18,9 @@ JAVA_JAR='zip -q0' fi else - dnl - dnl we have a custom path defined so use it - dnl + dnl + dnl we have a custom path defined so use it + dnl if test -x $PHP_JAVA/bin/jar; then JAVA_JAR="$PHP_JAVA/bin/jar cf" else @@ -33,23 +33,20 @@ AC_DEFUN(JAVA_FIND_C, [ AC_MSG_CHECKING([Java C location]) - JAVA_C=which javac - if test -z "$JAVA_C"; then - dnl - dnl we will auto assume that the bin directory is underneath - dnl the user provided directory, and it includes the javac - dnl directory. - dnl - if test -z "$PHP_JAVA" != "yes"; then - if test -x $PHP_JAVA/bin/javac; then - JAVA_C=$PHP_JAVA/bin/javac - else - AC_MSG_ERROR([Unable to locate $PHP_JAVA/bin]) - fi - fi - fi - if test -z "$JAVA_C"; then - AC_MSG_ERROR([Unable to locate the javac binary in your system path + if test "$PHP_JAVA" = "yes"; then + JAVA_C=which javac + else + dnl + dnl We've been given a path to use, so use it + dnl + if test -x $PHP_JAVA/bin/javac; then + JAVA_C=$PHP_JAVA/bin/javac + else + AC_MSG_ERROR([Unable to locate $PHP_JAVA/bin]) + fi + fi + if test -z "$JAVA_C"; then + AC_MSG_ERROR([Unable to locate the javac binary in your system path Either adjust your Java installation or provide the Java installation path, e.g. --with-java=/java expecting /java/bin/ to contain the binaries]) fi @@ -151,9 +148,10 @@ if test "$platform" = "Darwin"; then AC_CHECK_HEADERS([JavaVM/JavaVM.h]) AC_CHECK_HEADERS([JavaVM/jni.h]) - JAVA_CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar + dnl JAVA_CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar PHP_CHECK_FRAMEWORK("JavaVM", JNI_CreateJavaVM,[AC_DEFINE(HAVE_JAVA,1,[ ])]) PHP_ADD_FRAMEWORK("JavaVM") + JAVA_CFLAGS="-x objective-c" else JAVA_CHECK_LIB() AC_DEFINE(HAVE_JAVA,1,[ ]) Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.67 php4/ext/java/java.c:1.68 --- php4/ext/java/java.c:1.67 Wed Aug 14 12:22:19 2002 +++ php4/ext/java/java.c Tue Aug 20 21:41:21 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.67 2002/08/14 16:22:19 kalowsky Exp $ */ +/* $Id: java.c,v 1.68 2002/08/21 01:41:21 kalowsky Exp $ */ #ifdef HAVE_CONFIG_H @@ -34,10 +34,8 @@ #include "php_ini.h" #include "php_globals.h" -/* #if defined(__MacOSX__) */ #if HAVE_JAVAVM_JAVAVM_H #include <JavaVM/JavaVM.h> -#define JAVALIB "libjvm.dylib" #define JNI_12 #else #include <jni.h>