382f84c958
. OBS-URL: https://build.opensuse.org/request/show/285062 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=1
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
--- configure.in.orig 2014-10-09 17:42:26.749925309 +0200
|
|
+++ configure.in 2014-10-09 17:43:02.026926627 +0200
|
|
@@ -4042,11 +4042,7 @@
|
|
if test -d "$with_jvm_lib"; then
|
|
saved_LDFLAGS="$LDFLAGS"
|
|
LDFLAGS="$LDFLAGS -L$with_jvm_lib"
|
|
- if test "x$mac_java_fw" != "x"; then
|
|
- AC_CHECK_FW_FUNC($mac_java_fw,JNI_CreateJavaVM,HAS_LIB_JVM=yes,HAS_LIB_JVM=no,)
|
|
- else
|
|
- AC_CHECK_LIB(jvm,JNI_CreateJavaVM,HAS_LIB_JVM=yes,HAS_LIB_JVM=no,)
|
|
- fi
|
|
+ AC_CHECK_LIB(jvm,JNI_CreateJavaVM,HAS_LIB_JVM=yes,HAS_LIB_JVM=no,)
|
|
LDFLAGS="$saved_LDFLAGS"
|
|
if test "$HAS_LIB_JVM" = "yes"; then
|
|
JVM_LIB="-L$with_jvm_lib -ljvm"
|
|
@@ -4085,11 +4081,7 @@
|
|
unset ac_cv_lib_jvm_JNI_CreateJavaVM
|
|
saved_LDFLAGS="$LDFLAGS"
|
|
LDFLAGS="$LDFLAGS -L$TEST_DIR"
|
|
- if test "x$mac_java_fw" != "x"; then
|
|
- AC_CHECK_FW_FUNC($mac_java_fw,JNI_CreateJavaVM,HAS_LIB_JVM=yes,HAS_LIB_JVM=no,)
|
|
- else
|
|
- AC_CHECK_LIB(jvm,JNI_CreateJavaVM,HAS_LIB_JVM=yes,HAS_LIB_JVM=no,)
|
|
- fi
|
|
+ AC_CHECK_LIB(jvm,JNI_CreateJavaVM,HAS_LIB_JVM=yes,HAS_LIB_JVM=no,)
|
|
LDFLAGS="$saved_LDFLAGS"
|
|
if test "$HAS_LIB_JVM" = "yes"; then
|
|
JVM_LIB="-L$TEST_DIR -ljvm"
|