cvs: php4 /ext/java config.m4 java.c
| From: | Dan Kalowsky | Date: | Wed, 14 Aug 2002 16:22:21 +0000 |
| Subject: | cvs: php4 /ext/java config.m4 java.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13356@lists.php.net to get a copy of this message | ||
kalowsky Wed Aug 14 12:22:21 2002 EDT
Modified files:
/php4/ext/java config.m4 java.c
Log:
Adding in MSG_RESULT check and \n for configure output viewing
Index: php4/ext/java/config.m4
diff -u php4/ext/java/config.m4:1.39 php4/ext/java/config.m4:1.40
--- php4/ext/java/config.m4:1.39 Wed Aug 14 12:11:48 2002
+++ php4/ext/java/config.m4 Wed Aug 14 12:22:19 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.39 2002/08/14 16:11:48 kalowsky Exp $
+dnl $Id: config.m4,v 1.40 2002/08/14 16:22:19 kalowsky Exp $
dnl
AC_DEFUN(JAVA_FIND_JAR, [
AC_MSG_CHECKING([Java Jar location])
@@ -126,6 +126,7 @@
fi
JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT"
+ AC_MSG_RESULT([$JAVA_LIBPATH])
fi
])
Index: php4/ext/java/java.c
diff -u php4/ext/java/java.c:1.66 php4/ext/java/java.c:1.67
--- php4/ext/java/java.c:1.66 Tue Aug 6 18:08:22 2002
+++ php4/ext/java/java.c Wed Aug 14 12:22:19 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: java.c,v 1.66 2002/08/06 22:08:22 kalowsky Exp $ */
+/* $Id: java.c,v 1.67 2002/08/14 16:22:19 kalowsky Exp $ */
#ifdef HAVE_CONFIG_H
@@ -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>