From 177ebd9bf36a4603935ab7d0f5f3d10199fe26d0 Mon Sep 17 00:00:00 2001
From: Nigel Metheringham <nigel@exim.org>
Date: Fri, 20 Nov 2009 21:22:20 +0000
Subject: [PATCH] Flag broken perl installation during build.  Fixes: #915

---
 doc/doc-txt/ChangeLog          | 4 +++-
 src/scripts/Configure-Makefile | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index bb0f3ad5d..5f164eac8 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.597 2009/11/20 12:18:19 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.598 2009/11/20 21:22:20 nm4 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -14,6 +14,8 @@ NM/02 Bugzilla 722: Documentation for randint.  Better randomness defaults.
 
 NM/03 Bugzilla 847: Enable DNSDB lookup by default.
 
+NM/04 Bugzilla 915: Flag broken perl installation during build.
+
 
 Exim version 4.70
 -----------------
diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile
index 41cc88b18..35bb2c32f 100755
--- a/src/scripts/Configure-Makefile
+++ b/src/scripts/Configure-Makefile
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Cambridge: exim/src/scripts/Configure-Makefile,v 1.2 2005/09/19 14:42:31 ph10 Exp $
+# $Cambridge: exim/src/scripts/Configure-Makefile,v 1.3 2009/11/20 21:22:20 nm4 Exp $
 
 # Shell script to build Makefile in a build directory. It must be called
 # from inside the directory. It does its own checking of when to rebuild; it
@@ -129,6 +129,12 @@ if [ "${EXIM_PERL}" != "" ] ; then
     exit 1
   fi
 
+  EXTUTILS_EMBED_NOT_INSTALLED=`$PERL_COMMAND -MExtUtils::Embed -e ";" 2>&1`
+  if [ "${EXTUTILS_EMBED_NOT_INSTALLED}" != "" ] ; then
+    echo "Please install ExtUtils::Embed for $PERL_COMMAND"
+    exit 1;
+  fi
+
   mv $mft $mftt
   echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft
   echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts`" >>$mft
-- 
2.30.2