]>
Commit | Line | Data |
---|---|---|
dc1b7678 JP |
1 | --- graphviz-2.47.2/configure.ac.orig 2023-07-07 00:56:28.786941939 +0200 |
2 | +++ graphviz-2.47.2/configure.ac 2023-07-07 01:11:13.505632331 +0200 | |
3 | @@ -808,6 +808,7 @@ | |
4 | use_java="No (swig does not support -java option)" | |
5 | else | |
6 | AC_CHECK_PROG(JAVA,java,java) | |
7 | + AC_CHECK_PROG(JAVAC,javac,javac) | |
8 | if test "x$JAVA" = "x"; then | |
9 | use_java="No (java not available)" | |
10 | else | |
11 | --- graphviz-2.47.2/tclpkg/gv/Makefile.am.orig 2021-05-27 02:56:40.000000000 +0200 | |
12 | +++ graphviz-2.47.2/tclpkg/gv/Makefile.am 2023-07-07 01:10:42.433234989 +0200 | |
13 | @@ -535,7 +535,7 @@ | |
14 | endif | |
15 | install-data-hook: | |
16 | if WITH_JAVA | |
17 | - (cd $(DESTDIR)$(pkgjavadir); $(LN_S) -f org/graphviz/libgv_java.$(JSHEXT) ../../libgv.$(JSHEXT); javac -classpath $(DESTDIR)$(libjavadir) gv.java;) | |
18 | + (cd $(DESTDIR)$(pkgjavadir); $(LN_S) -f org/graphviz/libgv_java.$(JSHEXT) ../../libgv.$(JSHEXT); $(JAVAC) -classpath $(DESTDIR)$(libjavadir) gv.java;) | |
19 | endif | |
20 | if WITH_LUA | |
21 | (cd $(DESTDIR)$(pkgluadir); rm -f gv.so; $(LN_S) libgv_lua.so gv.so;) | |
22 | @@ -603,8 +603,8 @@ | |
23 | ln -f ../$(srcdir)/test.java .; \ | |
24 | ln -f ../$(srcdir)/hello.gv .; \ | |
25 | ln -f ../$(srcdir)/test.java .; \ | |
26 | - CLASSPATH=. javac *.java; \ | |
27 | - LD_LIBRARY_PATH=. CLASSPATH=. java test) | |
28 | + CLASSPATH=. $(JAVAC) *.java; \ | |
29 | + LD_LIBRARY_PATH=. CLASSPATH=. $(JAVA) test) | |
30 | ||
31 | .PHONY: test_lua | |
32 | test_lua: libgv_lua.la |