diff options
author | Tomáš Chvátal <tchvatal@suse.cz> | 2011-09-08 14:20:48 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-12 10:39:12 +0100 |
commit | 9459d4e893f0e8c98479b69af5b5ab0c07bc819d (patch) | |
tree | 40e7552f8f34907b1f378802247f8cf21bf4e666 /configure.in | |
parent | ditch distracting CHARSET_ANSI comment (diff) | |
download | core-9459d4e893f0e8c98479b69af5b5ab0c07bc819d.tar.gz core-9459d4e893f0e8c98479b69af5b5ab0c07bc819d.zip |
Do not search for java packages if --without-java is passed.
Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz>
Diffstat (limited to 'configure.in')
-rwxr-xr-x | configure.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 53882a00e7fa..20ece15fd2a9 100755 --- a/configure.in +++ b/configure.in @@ -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) |