* Jrgen Htzel <juergen@hoetzel.info>

Fixe java swig requirement for configure
This commit is contained in:
Aaron Griffin 2006-12-21 17:15:24 +00:00
parent 74e347f09b
commit 1bdf36f419

View file

@ -261,8 +261,7 @@ AC_MSG_CHECKING(if Java bindings should be generated)
if test x$wantjava = xyes ; then if test x$wantjava = xyes ; then
AC_CHECK_PROGS([SWIG], [swig]) AC_CHECK_PROGS([SWIG], [swig])
AC_CHECK_PROGS([JAVAC], [javac]) AC_CHECK_PROGS([JAVAC], [javac])
AM_CONDITIONAL(HAS_JAVA, test $SWIG) AM_CONDITIONAL(HAS_JAVA, test $JAVAC -a $SWIG)
AM_CONDITIONAL(HAS_JAVA, test $JAVAC)
if test $JAVAC ; then if test $JAVAC ; then
if test $SWIG ; then if test $SWIG ; then
AC_DEFINE([HAS_JAVA], [TRUE], [Enabled Java Support (javac=ok swig=ok)]) AC_DEFINE([HAS_JAVA], [TRUE], [Enabled Java Support (javac=ok swig=ok)])
@ -285,7 +284,7 @@ if test x$wantjava = xyes ; then
fi fi
fi fi
else else
AM_CONDITIONAL(HAS_JAVA, test $JAVAC) AM_CONDITIONAL(HAS_JAVA, test $JAVAC -a $SWIG)
AC_DEFINE([HAS_JAVA], [FALSE], [Not specified at configure line]) AC_DEFINE([HAS_JAVA], [FALSE], [Not specified at configure line])
AC_MSG_RESULT(not requested by configure) AC_MSG_RESULT(not requested by configure)
JAVASTATUS="no, disabled by configure" JAVASTATUS="no, disabled by configure"