|
Lines 24-31
Link Here
|
| 24 |
|
24 |
|
| 25 |
AC_MSG_CHECKING(which operating system we're using) |
25 |
AC_MSG_CHECKING(which operating system we're using) |
| 26 |
AC_CACHE_VAL(pike_cv_java_sysos, [ |
26 |
AC_CACHE_VAL(pike_cv_java_sysos, [ |
|
|
27 |
rpath_opt=-R |
| 27 |
pike_cv_java_sysos="`uname | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`" |
28 |
pike_cv_java_sysos="`uname | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`" |
| 28 |
case "$pike_cv_java_sysos" in |
29 |
case "$pike_cv_java_sysos" in |
|
|
30 |
Linux|linux) |
| 31 |
pike_cv_java_sysos="linux" |
| 32 |
rpath_opt="-Wl,-rpath," |
| 33 |
;; |
| 29 |
sunos) |
34 |
sunos) |
| 30 |
case "`uname -r`" in |
35 |
case "`uname -r`" in |
| 31 |
5.*|6.*|7.*) pike_cv_java_sysos="solaris"; |
36 |
5.*|6.*|7.*) pike_cv_java_sysos="solaris"; |
|
Lines 167-174
Link Here
|
| 167 |
if test "x$pike_cv_java_lib_dir" = xno; then :; else |
174 |
if test "x$pike_cv_java_lib_dir" = xno; then :; else |
| 168 |
echo Adding $pike_cv_java_lib_dir to the library search path. |
175 |
echo Adding $pike_cv_java_lib_dir to the library search path. |
| 169 |
for i in $pike_cv_java_lib_dir; do |
176 |
for i in $pike_cv_java_lib_dir; do |
| 170 |
LDFLAGS="-L$i -R$i ${LDFLAGS}" |
177 |
LDFLAGS="-L$i $rpath_opt$i ${LDFLAGS}" |
| 171 |
LINKER_OPTIONS="-L$i -R$i ${LINKER_OPTIONS}" |
178 |
LINKER_OPTIONS="-L$i $rpath_opt$i ${LINKER_OPTIONS}" |
| 172 |
JAVA_LIBPATH="${JAVA_LIBPATH}${JAVA_LIBPATH:+:}$i" |
179 |
JAVA_LIBPATH="${JAVA_LIBPATH}${JAVA_LIBPATH:+:}$i" |
| 173 |
# LIBPATH="${LIBPATH}${LIBPATH:+:}$i" |
180 |
# LIBPATH="${LIBPATH}${LIBPATH:+:}$i" |
| 174 |
done |
181 |
done |
|
Lines 269-275
Link Here
|
| 269 |
AC_MSG_CHECKING([for JNI_CreateJavaVM in -ljvm]) |
276 |
AC_MSG_CHECKING([for JNI_CreateJavaVM in -ljvm]) |
| 270 |
AC_CACHE_VAL(ac_cv_lib_jvm_JNI_CreateJavaVM, [ |
277 |
AC_CACHE_VAL(ac_cv_lib_jvm_JNI_CreateJavaVM, [ |
| 271 |
ac_save_LIBS="$LIBS" |
278 |
ac_save_LIBS="$LIBS" |
| 272 |
LIBS="-ljvm $LIBS" |
279 |
if test "$pike_cv_java_threads_type" = native_threads; then |
|
|
280 |
LIBS="-ljvm -lpthread $LIBS" |
| 281 |
else |
| 282 |
LIBS="-ljvm $LIBS" |
| 283 |
fi |
| 273 |
AC_TRY_LINK([#include <jni.h>], dnl |
284 |
AC_TRY_LINK([#include <jni.h>], dnl |
| 274 |
[JNI_CreateJavaVM((JavaVM**)0,(void**)0,(void*)0);], dnl |
285 |
[JNI_CreateJavaVM((JavaVM**)0,(void**)0,(void*)0);], dnl |
| 275 |
[ac_cv_lib_jvm_JNI_CreateJavaVM=yes], dnl |
286 |
[ac_cv_lib_jvm_JNI_CreateJavaVM=yes], dnl |
|
Lines 277-284
Link Here
|
| 277 |
LIBS="$ac_save_LIBS" |
288 |
LIBS="$ac_save_LIBS" |
| 278 |
]) |
289 |
]) |
| 279 |
if test x"$ac_cv_lib_jvm_JNI_CreateJavaVM" = xyes; then |
290 |
if test x"$ac_cv_lib_jvm_JNI_CreateJavaVM" = xyes; then |
| 280 |
LIBS="-ljvm $LIBS" |
291 |
if test "$pike_cv_java_threads_type" = native_threads; then |
| 281 |
JAVA_LIBS="-ljvm ${JAVA_LIBS}" |
292 |
LIBS="-ljvm -lpthread $LIBS" |
|
|
293 |
JAVA_LIBS="-ljvm -lpthread ${JAVA_LIBS}" |
| 294 |
else |
| 295 |
LIBS="-ljvm $LIBS" |
| 296 |
JAVA_LIBS="-ljvm ${JAVA_LIBS}" |
| 297 |
fi |
| 282 |
pike_cv_java=yes; |
298 |
pike_cv_java=yes; |
| 283 |
AC_MSG_RESULT(yes) |
299 |
AC_MSG_RESULT(yes) |
| 284 |
else |
300 |
else |
