configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c2c09e9de742099700a51ec25d2ee923db3604c6
Author: Stephan Bergmann <[email protected]>
AuthorDate: Wed Mar 25 11:30:10 2020 +0100
Commit: Stephan Bergmann <[email protected]>
CommitDate: Wed Mar 25 14:09:37 2020 +0100
Fix test for /usr/share/java/flute-1.3.0.jar
The old test was always true (as -f/usr/share/java/flute-1.3.0.jar is not
the
null string), so in a --with-system-jfreereport build that did not
explicitly
configure --with-flute=..., FLUTE_JAR was always set to
/usr/share/java/libxml-1.0.0.jar, even if that file does not exist (as e.g.
on
Fedora, where e.g. flute-1.3.0-22.OOo31.fc32.noarch includes
/usr/share/java/flute.jar instead).
The only use of FLUTE_JAR is in gb_Jar__use_flute in RepositoryExternal.mk,
and
the only use of that is in reportbuilder/Jar_reportbuilder.mk, but which
seems
to not mind if the given jar doesn't exist?
Change-Id: Iea94ed34b4df61d2abed67b54bd4caa24ede7e80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91039
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <[email protected]>
diff --git a/configure.ac b/configure.ac
index 6f0fa7f3d400..f2f27e9522f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11342,7 +11342,7 @@ if test "$enable_report_builder" != "no" -a
"$with_java" != "no"; then
fi
if test -z $FLUTE_JAR; then
- if test -f/usr/share/java/flute-1.3.0.jar; then
+ if test -f /usr/share/java/flute-1.3.0.jar; then
FLUTE_JAR=/usr/share/java/flute-1.3.0.jar
elif test -f /usr/share/java/flute.jar; then
FLUTE_JAR=/usr/share/java/flute.jar
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
