Do not search for java packages if --without-java is passed.

Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz>
This commit is contained in:
Tomáš Chvátal 2011-09-08 14:20:48 +02:00 committed by Caolán McNamara
parent 3df2068878
commit 9459d4e893

View file

@ -4977,6 +4977,7 @@ AC_SUBST(DB_CPPLIB)
dnl ===================================================================
dnl Check for system lucene
dnl ===================================================================
if test "$with_java" != "no"; then
AC_MSG_CHECKING([which lucene to use])
if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
@ -5036,6 +5037,7 @@ else
SYSTEM_LUCENE=NO
BUILD_TYPE="$BUILD_TYPE LUCENE"
fi
fi
AC_SUBST(SYSTEM_LUCENE)
AC_SUBST(LUCENE_CORE_JAR)
AC_SUBST(LUCENE_ANALYZERS_JAR)
@ -5204,6 +5206,7 @@ AC_SUBST(HSQLDB_JAR)
dnl ===================================================================
dnl Check for system beanshell
dnl ===================================================================
if test "$with_java" != "no"; then
AC_MSG_CHECKING([which beanshell to use])
if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
@ -5219,6 +5222,7 @@ else
SYSTEM_BSH=NO
BUILD_TYPE="$BUILD_TYPE BSH"
fi
fi
AC_SUBST(SYSTEM_BSH)
AC_SUBST(BSH_JAR)
@ -5226,6 +5230,7 @@ AC_SUBST(BSH_JAR)
dnl ===================================================================
dnl Check for system saxon
dnl ===================================================================
if test "$with_java" != "no"; then
AC_MSG_CHECKING([which saxon to use])
if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
@ -5325,6 +5330,7 @@ else
SYSTEM_SAXON=NO
NEED_SAXON=TRUE
fi
fi
AC_SUBST(SYSTEM_SAXON)
AC_SUBST(SAXON_JAR)