From 1bdf36f41939fedd2a02c91b9742ba01fd899bb4 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Thu, 21 Dec 2006 17:15:24 +0000 Subject: * Jürgen Hötzel Fixe java swig requirement for configure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f617685f..d4e3f428 100644 --- a/configure.ac +++ b/configure.ac @@ -261,8 +261,7 @@ AC_MSG_CHECKING(if Java bindings should be generated) if test x$wantjava = xyes ; then AC_CHECK_PROGS([SWIG], [swig]) AC_CHECK_PROGS([JAVAC], [javac]) - AM_CONDITIONAL(HAS_JAVA, test $SWIG) - AM_CONDITIONAL(HAS_JAVA, test $JAVAC) + AM_CONDITIONAL(HAS_JAVA, test $JAVAC -a $SWIG) if test $JAVAC ; then if test $SWIG ; then AC_DEFINE([HAS_JAVA], [TRUE], [Enabled Java Support (javac=ok swig=ok)]) @@ -285,7 +284,7 @@ if test x$wantjava = xyes ; then fi fi 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_MSG_RESULT(not requested by configure) JAVASTATUS="no, disabled by configure" -- cgit v1.2.3-70-g09d2