summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-12-21 17:15:24 +0000
committerAaron Griffin <aaron@archlinux.org>2006-12-21 17:15:24 +0000
commit1bdf36f41939fedd2a02c91b9742ba01fd899bb4 (patch)
tree9438edcb56ba616fc2697b04f52d3c17590ab202
parent74e347f09bd62872de84b431dcf029090931d199 (diff)
downloadpacman-1bdf36f41939fedd2a02c91b9742ba01fd899bb4.tar.xz
* Jürgen Hötzel <juergen@hoetzel.info>
Fixe java swig requirement for configure
-rw-r--r--configure.ac5
1 files 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"