You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by pe...@apache.org on 2014/02/23 21:32:17 UTC

svn commit: r1571087 - /openoffice/trunk/main/configure.in

Author: pescetti
Date: Sun Feb 23 20:32:17 2014
New Revision: 1571087

URL: http://svn.apache.org/r1571087
Log:
#i124301# Override system epm and --with-epm if --with-epm-url is used.

Modified:
    openoffice/trunk/main/configure.in

Modified: openoffice/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1571087&r1=1571086&r2=1571087&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Sun Feb 23 20:32:17 2014
@@ -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=