jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix using com.sun.tools.javadoc package under macOS

Browse source 
Export JAVA_HOME found by configure, so that the Java test suite makefile
could find this package under this directory.
This commit is contained in:
Vadim Zeitlin 2016-12-12 22:28:57 +01:00
commit 04a5215665
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/test-suite/java/Makefile.in
View file

@ -6,9 +6,11 @@ LANGUAGE = java
JAVA = @JAVA@ JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAFLAGS = @JAVAFLAGS@ JAVAFLAGS = @JAVAFLAGS@
JAVA_CLASSPATH_SEP := @JAVA_CLASSPATH_SEP@ JAVA_CLASSPATH_SEP = @JAVA_CLASSPATH_SEP@
SCRIPTSUFFIX = _runme.java SCRIPTSUFFIX = _runme.java
JAVA_HOME ?= @JAVA_HOME@
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = ../@top_srcdir@ top_srcdir = ../@top_srcdir@
top_builddir = ../@top_builddir@ top_builddir = ../@top_builddir@

1
configure.ac
View file

@ -1391,6 +1391,7 @@ fi
# Turned off due to spurious warnings in later versions of openjdk-1.8 # Turned off due to spurious warnings in later versions of openjdk-1.8
# JAVAFLAGS=-Xcheck:jni # JAVAFLAGS=-Xcheck:jni
AC_SUBST(JAVA_HOME)
AC_SUBST(JAVA) AC_SUBST(JAVA)
AC_SUBST(JAVAC) AC_SUBST(JAVAC)
AC_SUBST(JAVAINC) AC_SUBST(JAVAINC)