@@ -15,7 +15,7 @@ dnl reserved.
15
15
dnl Copyright (c) 2007-2012 Oracle and/or its affiliates. All rights reserved.
16
16
dnl Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved.
17
17
dnl Copyright (c) 2013 Intel, Inc. All rights reserved.
18
- dnl Copyright (c) 2015 Research Organization for Information Science
18
+ dnl Copyright (c) 2015-2018 Research Organization for Information Science
19
19
dnl and Technology (RIST). All rights reserved.
20
20
dnl Copyright (c) 2017 FUJITSU LIMITED. All rights reserved.
21
21
dnl $COPYRIGHT $
@@ -37,7 +37,7 @@ AC_DEFUN([OPAL_SETUP_JAVA_BANNER],[
37
37
AC_DEFUN([OPAL_SETUP_JAVA],[
38
38
AC_REQUIRE([OPAL_SETUP_JAVA_BANNER])
39
39
40
- OPAL_VAR_SCOPE_PUSH([opal_java_bad opal_java_found opal_java_dir opal_java_jnih opal_java_PATH_save opal_java_CPPFLAGS_save])
40
+ OPAL_VAR_SCOPE_PUSH([opal_java_bad opal_javah_happy opal_java_found opal_java_dir opal_java_jnih opal_java_PATH_save opal_java_CPPFLAGS_save])
41
41
AC_ARG_ENABLE(java,
42
42
AC_HELP_STRING([--enable-java],
43
43
[Enable Java-based support in the system - use this option to disable all Java-based compiler tests (default: enabled)]))
@@ -161,13 +161,13 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
161
161
AS_IF([test -n " $with_jdk_bindir " && test " $with_jdk_bindir " != " yes" && test " $with_jdk_bindir " != " no" ],
162
162
[PATH= " $with_jdk_bindir :$PATH " ])
163
163
AC_PATH_PROG(JAVAC, javac)
164
- AC_PATH_PROG(JAVAH, javah)
165
164
AC_PATH_PROG(JAR, jar)
166
165
AC_PATH_PROG(JAVADOC, javadoc)
166
+ AC_PATH_PROG(JAVAH, javah)
167
167
PATH=$opal_java_PATH_save
168
168
169
- # Check to see if we have all 4 programs.
170
- AS_IF([test -z " $JAVAC " || test -z " $JAVAH " || test -z " $ JAR" || test -z " $JAVADOC " ],
169
+ # Check to see if we have all 3 programs.
170
+ AS_IF([test -z " $JAVAC " || test -z " $JAR " || test -z " $JAVADOC " ],
171
171
[opal_java_happy= no
172
172
HAVE_JAVA_SUPPORT= 0],
173
173
[opal_java_happy= yes
@@ -178,6 +178,21 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
178
178
[opal_java_CPPFLAGS_save= $CPPFLAGS
179
179
# silence a stupid Mac warning
180
180
CPPFLAGS= " $CPPFLAGS -DTARGET_RT_MAC_CFM=0"
181
+ AC_MSG_CHECKING([javac -h ])
182
+ cat > Conftest.java << EOF
183
+ public final class Conftest {
184
+ public native void conftest ();
185
+ }
186
+ EOF
187
+ AS_IF([$JAVAC -d . -h . Conftest.java > /dev/null 2>&1 ],
188
+ [AC_MSG_RESULT([yes])],
189
+ [AC_MSG_RESULT([no])
190
+ AS_IF([test -n " $JAVAH " ],
191
+ [opal_javah_happy= yes],
192
+ [opal_java_happy= no])])
193
+ rm -f Conftest.java Conftest.class Conftest.h
194
+
195
+
181
196
AS_IF([test -n " $with_jdk_headers " && test " $with_jdk_headers " != " yes" && test " $with_jdk_headers " != " no" ],
182
197
[OPAL_JDK_CPPFLAGS= " -I$with_jdk_headers "
183
198
# Some flavors of JDK also require -I<blah>/linux.
@@ -216,5 +231,6 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
216
231
217
232
AC_DEFINE_UNQUOTED([OPAL_HAVE_JAVA_SUPPORT], [$HAVE_JAVA_SUPPORT ], [do we have Java support])
218
233
AM_CONDITIONAL(OPAL_HAVE_JAVA_SUPPORT, test " $opal_java_happy " = " yes" )
234
+ AM_CONDITIONAL(OPAL_HAVE_JAVAH_SUPPORT, test " $opal_javah_happy " = " yes" )
219
235
OPAL_VAR_SCOPE_POP
220
236
])
0 commit comments