diff options
| author | Dan Kalowsky <kalowsky@php.net> | 2002-08-14 16:22:20 +0000 |
|---|---|---|
| committer | Dan Kalowsky <kalowsky@php.net> | 2002-08-14 16:22:20 +0000 |
| commit | 73557f5b52e8aed36b405467a5d23efd98a64abc (patch) | |
| tree | 328eb6a215bd178dd3a193c796380801d31ddda4 | |
| parent | c0a79401fd621d97206b21f77abd4782a86d26ed (diff) | |
| download | php-git-73557f5b52e8aed36b405467a5d23efd98a64abc.tar.gz | |
Adding in MSG_RESULT check and \n for configure output viewing
| -rw-r--r-- | ext/java/config.m4 | 1 | ||||
| -rw-r--r-- | ext/java/java.c | 15 | ||||
| -rw-r--r-- | ext/rpc/java/config.m4 | 1 | ||||
| -rw-r--r-- | ext/rpc/java/java.c | 15 |
4 files changed, 26 insertions, 6 deletions
diff --git a/ext/java/config.m4 b/ext/java/config.m4 index 4e718fc3c8..c6eedc83c9 100644 --- a/ext/java/config.m4 +++ b/ext/java/config.m4 @@ -126,6 +126,7 @@ dnl fi JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT" + AC_MSG_RESULT([$JAVA_LIBPATH]) fi ]) diff --git a/ext/java/java.c b/ext/java/java.c index 8ca54b87b0..3073627c4d 100644 --- a/ext/java/java.c +++ b/ext/java/java.c @@ -34,12 +34,21 @@ #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> +#endif + + #ifdef PHP_WIN32 - #include "win32/winutil.h" - #define DL_ERROR php_win_err() +#include "win32/winutil.h" +#define DL_ERROR php_win_err() #endif -#include <jni.h> #include <stdio.h> diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4 index 4e718fc3c8..c6eedc83c9 100644 --- a/ext/rpc/java/config.m4 +++ b/ext/rpc/java/config.m4 @@ -126,6 +126,7 @@ dnl fi JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT" + AC_MSG_RESULT([$JAVA_LIBPATH]) fi ]) diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c index 8ca54b87b0..3073627c4d 100644 --- a/ext/rpc/java/java.c +++ b/ext/rpc/java/java.c @@ -34,12 +34,21 @@ #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> +#endif + + #ifdef PHP_WIN32 - #include "win32/winutil.h" - #define DL_ERROR php_win_err() +#include "win32/winutil.h" +#define DL_ERROR php_win_err() #endif -#include <jni.h> #include <stdio.h> |