Skip to content

Commit

Permalink
Workaround javac popup on MacOS X
Browse files Browse the repository at this point in the history
MacOS X does not ship with Java installed by default. Instead it
includes binary stubs that upon execution pop up a message suggesting
the installation of the JDK.

Since `javac` is only used when `antlr4` is available, it is possible
to work around the popup by only probing for `javac` if `antlr4` has
been successfully detected (in which case the JDK is probably already
installed on the system).

Fixes #23138.
  • Loading branch information
ranma42 committed Apr 3, 2015
1 parent 82dcec7 commit 0621a83
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion configure
Expand Up @@ -669,7 +669,6 @@ probe CFG_LD ld
probe CFG_VALGRIND valgrind
probe CFG_PERF perf
probe CFG_ISCC iscc
probe CFG_JAVAC javac
probe CFG_ANTLR4 antlr4
probe CFG_GRUN grun
probe CFG_FLEX flex
Expand All @@ -679,6 +678,14 @@ probe CFG_XELATEX xelatex
probe CFG_GDB gdb
probe CFG_LLDB lldb

# On MacOS X, invoking `javac` pops up a dialog if the JDK is not
# installed. Since `javac` is only used if `antlr4` is available,
# probe for it only in this case.
if [ ! -z "$CFG_ANTLR4" ]
then
probe CFG_JAVAC javac
fi

if [ ! -z "$CFG_GDB" ]
then
# Store GDB's version
Expand Down

0 comments on commit 0621a83

Please sign in to comment.