diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2012-02-02 22:49:28 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2012-02-02 22:50:06 +0100 |
| commit | 4cb33a7db765f8ad06e65d24a2396f2857a9cf0d (patch) | |
| tree | 4b0e7dd3bd54936229b8888b2325fdd16acce754 /configure.in | |
| parent | a4cbcf2fc567393cd954d0fcc8ea0ce7d859b59f (diff) | |
make --with-system-libs behave as documented
make it enable --with-system-headers and --with-system-jars
also fixup lucene-analyzers.jar search path
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 61d9bfae7ff6..60095188af11 100644 --- a/configure.in +++ b/configure.in @@ -998,15 +998,15 @@ AC_ARG_WITH(system-headers, AS_HELP_STRING([--with-system-headers], [Use headers already on system -- enables all --with-system-* flags for external packages whose headers are the only entities used i.e. - boost/vigra/odbc/sane-header(s).]), -,) + boost/vigra/odbc/sane-header(s).]),, + [with_system_headers="$with_system_libs"]) AC_ARG_WITH(system-jars, AS_HELP_STRING([--without-system-jars], [When building with --with-system-libs, also the needed jars are expected on the system. Use this to disable that (except for the db case where - --with-system-db *has to* imply using the db.jar from there, too).]), -,) + --with-system-db *has to* imply using the db.jar from there, too).]),, + [with_system_jars="$with_system_libs"]) AC_ARG_WITH(system-stdlibs, AS_HELP_STRING([--with-system-stdlibs], @@ -1107,8 +1107,8 @@ AC_ARG_WITH(system-libcmis, AC_ARG_WITH(system-libcdr, AS_HELP_STRING([--with-system-libcdr], - [Use libvisio already on system.]),, - [with_system_libcdr="no"]) + [Use libcdr already on system.]),, + [with_system_libcdr="$with_system_libs"]) AC_ARG_WITH(system-libvisio, AS_HELP_STRING([--with-system-libvisio], @@ -5930,7 +5930,11 @@ if test "$with_system_lucene" = "yes"; then [ AC_CHECK_FILE(/usr/share/java/lucene-contrib/lucene-analyzers.jar, [ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar ], - [ AC_MSG_ERROR(lucene-analyzers.jar replacement not found.)] + [ AC_CHECK_FILE(/usr/share/java/lucene-analyzers.jar, + [ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers.jar ], + [ AC_MSG_ERROR(lucene-analyzers.jar replacement not found.)] + ) + ] ) ] ) |