Kaydet (Commit) 4cb33a7d authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane

make --with-system-libs behave as documented

make it enable --with-system-headers and --with-system-jars
also fixup lucene-analyzers.jar search path
üst a4cbcf2f
...@@ -998,15 +998,15 @@ AC_ARG_WITH(system-headers, ...@@ -998,15 +998,15 @@ AC_ARG_WITH(system-headers,
AS_HELP_STRING([--with-system-headers], AS_HELP_STRING([--with-system-headers],
[Use headers already on system -- enables all --with-system-* flags for [Use headers already on system -- enables all --with-system-* flags for
external packages whose headers are the only entities used i.e. 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, AC_ARG_WITH(system-jars,
AS_HELP_STRING([--without-system-jars], AS_HELP_STRING([--without-system-jars],
[When building with --with-system-libs, also the needed jars are expected [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 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, AC_ARG_WITH(system-stdlibs,
AS_HELP_STRING([--with-system-stdlibs], AS_HELP_STRING([--with-system-stdlibs],
...@@ -1107,8 +1107,8 @@ AC_ARG_WITH(system-libcmis, ...@@ -1107,8 +1107,8 @@ AC_ARG_WITH(system-libcmis,
AC_ARG_WITH(system-libcdr, AC_ARG_WITH(system-libcdr,
AS_HELP_STRING([--with-system-libcdr], AS_HELP_STRING([--with-system-libcdr],
[Use libvisio already on system.]),, [Use libcdr already on system.]),,
[with_system_libcdr="no"]) [with_system_libcdr="$with_system_libs"])
AC_ARG_WITH(system-libvisio, AC_ARG_WITH(system-libvisio,
AS_HELP_STRING([--with-system-libvisio], AS_HELP_STRING([--with-system-libvisio],
...@@ -5930,7 +5930,11 @@ if test "$with_system_lucene" = "yes"; then ...@@ -5930,7 +5930,11 @@ if test "$with_system_lucene" = "yes"; then
[ [
AC_CHECK_FILE(/usr/share/java/lucene-contrib/lucene-analyzers.jar, AC_CHECK_FILE(/usr/share/java/lucene-contrib/lucene-analyzers.jar,
[ LUCENE_ANALYZERS_JAR=/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.)]
)
]
) )
] ]
) )
......
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