epm: use executables from WORKDIR and clean up configure

Change-Id: I69e75dbbaa16b6dc407a69ba8137c09888db50ce

4 files changed, 3 insertions, 31 deletions

diff --git a/configure.ac b/configure.ac
index ad72a5c2856a..e1d612430297 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7362,6 +7362,7 @@ if test "$enable_epm" = "yes"; then
         if test "$EPM" = "no" -o "$EPM" = "internal"; then
             echo "EPM will be built."
             BUILD_TYPE="$BUILD_TYPE EPM"
+            EPM=${WORKDIR}/UnpackedTarball/epm/epm
         else
             # Gentoo has some epm which is something different...
             AC_MSG_CHECKING([whether the found epm is the right epm])
@@ -7377,8 +7378,7 @@ if test "$enable_epm" = "yes"; then
                 AC_MSG_RESULT([OK, >= 3.7])
             else
                 AC_MSG_RESULT([too old. epm >= 3.7 is required.])
-                echo "EPM will be built."
-                BUILD_TYPE="$BUILD_TYPE EPM"
+                AC_MSG_ERROR([Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm])
             fi
         fi
     fi
@@ -7428,7 +7428,7 @@ if test "$enable_epm" = "yes"; then
     fi
     if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
        echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
-        if test "$EPM" != "no" -a "$EPM" != "internal"; then
+        if test "$with_epm" = "no" -a "$_os" != "Darwin"; then
             if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
                 AC_MSG_CHECKING([whether epm is patched for LibreOffice's needs])
                 if grep "Patched for LibreOffice" $EPM >/dev/null 2>/dev/null; then
diff --git a/external/epm/ExternalPackage_epm.mk b/external/epm/ExternalPackage_epm.mk
deleted file mode 100644
index 793f4192b787..000000000000
--- a/external/epm/ExternalPackage_epm.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,epm,epm))
-
-$(eval $(call gb_ExternalPackage_use_external_project,epm,epm))
-
-$(eval $(call gb_ExternalPackage_add_files,epm,bin,\
-	epm \
-	epminstall \
-	mkepmlist \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/epm/Module_epm.mk b/external/epm/Module_epm.mk
index f86455cb1f91..1f4ed076ba11 100644
--- a/external/epm/Module_epm.mk
+++ b/external/epm/Module_epm.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,epm))
 ifneq ($(CROSS_COMPILING),YES)
 
 $(eval $(call gb_Module_add_targets,epm,\
-	ExternalPackage_epm \
 	ExternalProject_epm \
 	UnpackedTarball_epm \
 ))
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 06897fbff474..c386465d1289 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -722,13 +722,6 @@ sub find_epm_on_system
         {
             $epmname = $ENV{'EPM'};
         }
-        elsif ( ($ENV{'EPM'} eq "no") || ($ENV{'EPM'} eq "internal") )
-        {
-            $epmname = "epm";
-            my $epmref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$epmname, $includepatharrayref, 0);
-            if ($$epmref eq "") { installer::exiter::exit_program("ERROR: Could not find program $epmname (EPM set to \"internal\" or \"no\")!", "find_epm_on_system"); }
-            $epmname = $$epmref;
-        }
         else
         {
             installer::exiter::exit_program("Environment variable EPM set (\"$ENV{'EPM'}\"), but file does not exist or is not executable!", "find_epm_on_system");