Commit 36ef02d1 authored by Filippo Carone's avatar Filippo Carone

Some Java checks on --enable-java-bindings:

 * JAVA_HOME is set
 * a java compiler compiles
parent 8914d39a
......@@ -11,7 +11,7 @@ PROCESSOR_FAMILY = `uname -m | sed -e 's/^i.86/i386/' | sed -e 's/^x86_64/amd64/
if HAVE_WIN32
JINCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32
LIBJINCLUDES = -L${JAVA_HOME}/lib -ljawt
JAVAC = javac
#JAVAC = javac
JCH = javah
#CXX = g++ -Wall -mno-cygwin -g
#LDFLAGS = -mno-cygwin `vlc-config --libs external pic` -Wl,--kill-at
......@@ -20,7 +20,7 @@ JAVALDFLAGS = -mno-cygwin -L../../src -lvlc `top_builddir=../.. ../../vlc-config
else
JINCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
LIBJINCLUDES = -L$(JAVA_HOME)/jre/lib/$(PROCESSOR_FAMILY) -ljawt
JAVAC = gcj -Wall -g -C
#JAVAC = gcj -Wall -g -C
JCH = gcjh -jni
SWT_PATH = /usr/share/java
# Compile flags
......
......@@ -5256,9 +5256,10 @@ dnl Java bindings
dnl
AC_ARG_ENABLE(java-bindings,
[ --enable-java-bindings Enable Java bindings (default disabled)])
if test "${enable-java-bindings}" = "yes"
if test "${enable_java_bindings}" = "yes"
then
AC_PROG_JAVA_CC(javac)
AS_IF([test "x${JAVA_HOME}" == "x"],
[AC_MSG_ERROR([Please set the JAVA_HOME variable to your JDK environment])])
AC_PROG_JAVAC
AC_PROG_JAVA
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment