Kaydet (Commit) 9459d4e8 authored tarafından Tomáš Chvátal's avatar Tomáš Chvátal Kaydeden (comit) Caolán McNamara

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

Signed-off-by: 's avatarTomáš Chvátal <tchvatal@suse.cz>
üst 3df20688
...@@ -4977,6 +4977,7 @@ AC_SUBST(DB_CPPLIB) ...@@ -4977,6 +4977,7 @@ AC_SUBST(DB_CPPLIB)
dnl =================================================================== dnl ===================================================================
dnl Check for system lucene dnl Check for system lucene
dnl =================================================================== dnl ===================================================================
if test "$with_java" != "no"; then
AC_MSG_CHECKING([which lucene to use]) AC_MSG_CHECKING([which lucene to use])
if test -n "$with_system_lucene" -o -n "$with_system_libs" && \ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
...@@ -5036,6 +5037,7 @@ else ...@@ -5036,6 +5037,7 @@ else
SYSTEM_LUCENE=NO SYSTEM_LUCENE=NO
BUILD_TYPE="$BUILD_TYPE LUCENE" BUILD_TYPE="$BUILD_TYPE LUCENE"
fi fi
fi
AC_SUBST(SYSTEM_LUCENE) AC_SUBST(SYSTEM_LUCENE)
AC_SUBST(LUCENE_CORE_JAR) AC_SUBST(LUCENE_CORE_JAR)
AC_SUBST(LUCENE_ANALYZERS_JAR) AC_SUBST(LUCENE_ANALYZERS_JAR)
...@@ -5204,6 +5206,7 @@ AC_SUBST(HSQLDB_JAR) ...@@ -5204,6 +5206,7 @@ AC_SUBST(HSQLDB_JAR)
dnl =================================================================== dnl ===================================================================
dnl Check for system beanshell dnl Check for system beanshell
dnl =================================================================== dnl ===================================================================
if test "$with_java" != "no"; then
AC_MSG_CHECKING([which beanshell to use]) AC_MSG_CHECKING([which beanshell to use])
if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \ if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
...@@ -5219,6 +5222,7 @@ else ...@@ -5219,6 +5222,7 @@ else
SYSTEM_BSH=NO SYSTEM_BSH=NO
BUILD_TYPE="$BUILD_TYPE BSH" BUILD_TYPE="$BUILD_TYPE BSH"
fi fi
fi
AC_SUBST(SYSTEM_BSH) AC_SUBST(SYSTEM_BSH)
AC_SUBST(BSH_JAR) AC_SUBST(BSH_JAR)
...@@ -5226,6 +5230,7 @@ AC_SUBST(BSH_JAR) ...@@ -5226,6 +5230,7 @@ AC_SUBST(BSH_JAR)
dnl =================================================================== dnl ===================================================================
dnl Check for system saxon dnl Check for system saxon
dnl =================================================================== dnl ===================================================================
if test "$with_java" != "no"; then
AC_MSG_CHECKING([which saxon to use]) AC_MSG_CHECKING([which saxon to use])
if test -n "$with_system_saxon" -o -n "$with_system_libs" && \ if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
...@@ -5325,6 +5330,7 @@ else ...@@ -5325,6 +5330,7 @@ else
SYSTEM_SAXON=NO SYSTEM_SAXON=NO
NEED_SAXON=TRUE NEED_SAXON=TRUE
fi fi
fi
AC_SUBST(SYSTEM_SAXON) AC_SUBST(SYSTEM_SAXON)
AC_SUBST(SAXON_JAR) AC_SUBST(SAXON_JAR)
......
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