Author: arielch
Date: Sun Sep 18 07:30:18 2016
New Revision: 1761303

URL: http://svn.apache.org/viewvc?rev=1761303&view=rev
Log:
i127119 - Check all Perl modules in configure

Modified:
    openoffice/branches/AOO413/main/configure.in

Modified: openoffice/branches/AOO413/main/configure.in
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO413/main/configure.in?rev=1761303&r1=1761302&r2=1761303&view=diff
==============================================================================
--- openoffice/branches/AOO413/main/configure.in (original)
+++ openoffice/branches/AOO413/main/configure.in Sun Sep 18 07:30:18 2016
@@ -2002,7 +2002,7 @@ dnl The list of required Perl modules is
 dnl     
http://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO#General_Build_Requirements
 dnl ===================================================================
 AC_MSG_CHECKING([for required Perl modules])
-if `$PERL -e 'use Archive::Zip; use LWP::UserAgent; use 
XML::Parser;'>/dev/null 2>&1`; then
+if `$PERL -e 'use Archive::Zip; use XML::Parser; use LWP::UserAgent; use 
Digest::SHA; use Digest::MD5; use LWP::Protocol::https;'>/dev/null 2>&1`; then
        AC_MSG_RESULT([all modules found])
 else
     # Find out which modules are missing.
@@ -2016,9 +2016,19 @@ else
     if ! `$PERL -e 'use XML::Parser;'>/dev/null 2>&1`; then
        missing_perl_modules="$missing_perl_modules XML::Parser"
     fi
+    if ! `$PERL -e 'use Digest::SHA;'>/dev/null 2>&1`; then
+       missing_perl_modules="$missing_perl_modules Digest::SHA"
+    fi
+    if ! `$PERL -e 'use Digest::MD5;'>/dev/null 2>&1`; then
+       missing_perl_modules="$missing_perl_modules Digest::MD5"
+    fi
+    if ! `$PERL -e 'use LWP::Protocol::https;'>/dev/null 2>&1`; then
+       missing_perl_modules="$missing_perl_modules LWP::Protocol::https"
+    fi
        AC_MSG_ERROR([
     The missing Perl modules are: $missing_perl_modules
-    Install them as superuser/administrator with "cpan -i 
$missing_perl_modules"])
+    Install them with your package manager (the name of the package depends on 
your system);
+    or, as last resort, run the following command as superuser/administrator: 
"cpan -i $missing_perl_modules"])
 fi
 
 dnl ===================================================================


Reply via email to