Here is a quick diff on the affected file from my workspace:
svn diff -r HEAD configure.in
--- configure.in (revision 1571281)
+++ configure.in (working copy)
@@ -3354,9 +3354,9 @@
AC_PATH_PROG(EPM, epm, no)
fi
- # Override system epm and --with-epm if --with-epm-url is used.
- if test -n "$with_epm_url" ; then
+ if test "$EPM" = "no" && 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=
@@ -3372,7 +3372,7 @@
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 (--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.])
+ AC_MSG_ERROR([no. Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm])
fi
AC_MSG_CHECKING([epm version])
EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
This fix will allow the build script to use the EPM package specified in --with-epm-url and disable the local EPM package.
