Repository.mk | 2 +- configure.ac | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)
New commits: commit 18cea6b8f8a928f8aad95c3c724f3163009c62c8 Author: Rene Engelhard <r...@debian.org> Date: Mon Apr 21 00:16:48 2014 +0200 fix reportbuilder*jar install; it's reportbuilder, not rhino Change-Id: I8b64b384b8f959c48e01bee8034c2fb046df75b0 diff --git a/Repository.mk b/Repository.mk index e8412a2..d009288 100644 --- a/Repository.mk +++ b/Repository.mk @@ -660,7 +660,7 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \ xmerge \ )) -$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \ +$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder, \ reportbuilder \ reportbuilderwizard \ )) commit aa16cd40066236a34542a472b2be55a2b8ba50f0 Author: Rene Engelhard <r...@debian.org> Date: Mon Apr 21 00:15:54 2014 +0200 fix --disable-coinmp we need a AC_ARG_ENABLE for it Change-Id: Iafdbcbb56674c6813c9b3601aab9d5832c7e2977 diff --git a/configure.ac b/configure.ac index 595eaf8..209975c 100644 --- a/configure.ac +++ b/configure.ac @@ -815,6 +815,10 @@ AC_ARG_ENABLE(lpsolve, AS_HELP_STRING([--disable-lpsolve], [Disable compilation of the lp solve solver ]) ) +AC_ARG_ENABLE(coinmp, + AS_HELP_STRING([--disable-coinmp], + [Disable compilation of the CoinMP solver ]) +) AC_ARG_ENABLE(pdfimport, AS_HELP_STRING([--disable-pdfimport], _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits