Author: af
Date: Thu Aug 16 11:45:36 2012
New Revision: 1373796
URL: http://svn.apache.org/viewvc?rev=1373796&view=rev
Log:
#i120589# Improved detection of missing perl modules.
Modified:
incubator/ooo/trunk/main/configure.in
Modified: incubator/ooo/trunk/main/configure.in
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1373796&r1=1373795&r2=1373796&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Thu Aug 16 11:45:36 2012
@@ -1958,12 +1958,27 @@ AC_SUBST(PERL)
dnl ===================================================================
dnl Testing for required Perl modules
+dnl The list of required Perl modules is documented here:
+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;'`; then
+if `$PERL -e 'use Archive::Zip; use LWP::UserAgent; use
XML::Parser;'>/dev/null 2>&1`; then
AC_MSG_RESULT([all modules found])
else
- AC_MSG_ERROR([Failed to find some modules])
+ # Find out which modules are missing.
+ missing_perl_modules=
+ if ! `$PERL -e 'use Archive::Zip;'>/dev/null 2>&1`; then
+ missing_perl_modules=Archive::Zip
+ fi
+ if ! `$PERL -e 'use LWP::UserAgent;'>/dev/null 2>&1`; then
+ missing_perl_modules="$missing_perl_modules LWP::UserAgent"
+ fi
+ if ! `$PERL -e 'use XML::Parser;'>/dev/null 2>&1`; then
+ missing_perl_modules="$missing_perl_modules XML::Parser"
+ fi
+ AC_MSG_ERROR([
+ The missing Perl modules are: $missing_perl_modules
+ Install them as superuser/administrator with "cpan -i
$missing_perl_modules"])
fi
dnl ===================================================================
