configure.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 51110dc31f8985f0f86ff20486d029a35c0f0920
Author: Andrea Pescetti <pesce...@apache.org>
Date: Sun Feb 23 20:32:17 2014 +0000
#i124301# Override system epm and --with-epm if --with-epm-url is used.
diff --git a/configure.in b/configure.in
index 44dfde3..9398ec9 100644
--- a/configure.in
+++ b/configure.in
@@ -3354,9 +3354,9 @@ if test "$enable_epm" = "yes"; then
AC_PATH_PROG(EPM, epm, no)
fi
- if test "$EPM" = "no" && test -n "$with_epm_url" ; then
+ # Override system epm and --with-epm if --with-epm-url is used.
+ if test -n "$with_epm_url" ; then
# At this moment we can not verify the URL or the content that we
want to download.
- # Neither can we apply the test below for ruling out that it is the
SunStudio dmake.
EPM_URL=$with_epm_url
AC_MSG_RESULT([epm will be downloaded and compiled in
bootstrap])
EPM=
commit caab055f151771adbec7b7de5eb952a4c7b11554
Author: Andrea Pescetti <pesce...@apache.org>
Date: Sun Feb 23 20:05:19 2014 +0000
#i124301# Use more informative error messages for EPM failures.
diff --git a/configure.in b/configure.in
index c8ebd1c..44dfde3 100644
--- a/configure.in
+++ b/configure.in
@@ -3372,7 +3372,7 @@ if test "$enable_epm" = "yes"; then
if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
AC_MSG_RESULT([yes])
else
- AC_MSG_ERROR([no. Install ESP Package Manager
(http://www.msweet.org/projects.php?Z2) and/or specify the path to the right
epm])
+ AC_MSG_ERROR([no. Install ESP Package Manager
(http://www.msweet.org/projects.php?Z2) and/or specify the path to the right
epm (--with-epm). Or specify an URL to an epm-3.7 source package
(--with-epm-url); run configure with the --help option for a list of possible
URLs.])
fi
AC_MSG_CHECKING([epm version])
EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 |
$SED -e s/v//`
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
