You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2019/01/22 20:11:35 UTC
svn commit: r1851860 - /openoffice/branches/AOO42X/main/configure.ac
Author: jim
Date: Tue Jan 22 20:11:35 2019
New Revision: 1851860
URL: http://svn.apache.org/viewvc?rev=1851860&view=rev
Log:
backport 1851859.
Modified:
openoffice/branches/AOO42X/main/configure.ac
Modified: openoffice/branches/AOO42X/main/configure.ac
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/configure.ac?rev=1851860&r1=1851859&r2=1851860&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/configure.ac (original)
+++ openoffice/branches/AOO42X/main/configure.ac Tue Jan 22 20:11:35 2019
@@ -3582,9 +3582,8 @@ msi - Windows .msi
if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
if test "$EPM" != "no" && test "$EPM" != "internal"; then
- if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
AC_MSG_CHECKING([whether epm is patched for AOOs needs])
- if $GREP "Patched for Apache OpenOffice" $EPM >/dev/null 2>/dev/null; then
+ if $GREP "Patched for .*OpenOffice" $EPM >/dev/null 2>/dev/null; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@@ -3602,7 +3601,6 @@ msi - Windows .msi
patch in epm/epm-3.7.patch or build with
--with-epm=internal which will build a suitable epm])
fi
- fi
fi
fi
if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then