Adding in MSG_RESULT check and \n for configure output viewing

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 4e718fc3c8a271c3282c302e9edb969c8f875c61..c6eedc83c9b8231f9fea16a7365b879ac639c7d2 100644 (file)
--- 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 8ca54b87b0f17afedb6e50eebae27c7d3c3453a0..3073627c4dbe28e9f163e1bba03e278d643684b2 100644 (file)
--- 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 4e718fc3c8a271c3282c302e9edb969c8f875c61..c6eedc83c9b8231f9fea16a7365b879ac639c7d2 100644 (file)
--- 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 8ca54b87b0f17afedb6e50eebae27c7d3c3453a0..3073627c4dbe28e9f163e1bba03e278d643684b2 100644 (file)
--- 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>