Do not refer to TRUSTED_CONFIG_PREFIX_FILE.

[users/jgh/exim.git] / src / scripts / Configure-Makefile

diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile
index 9db9650951933df8aad2c0bcc6e47aa904b38035..35bb2c32fea0124ec8016c6fd5f83db626dcfe58 100755 (executable)
--- a/src/scripts/Configure-Makefile
+++ b/src/scripts/Configure-Makefile
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# $Cambridge: exim/src/scripts/Configure-Makefile,v 1.1 2004/10/06 15:07:40 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
 
 # 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
 
     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
   mv $mft $mftt
   echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft
   echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts`" >>$mft


@@ -146,6 +152,7 @@ echo "" >>$mft
 # Finally, join on the generic base make file, which contains the actual
 # rules and stuff.
 
 # Finally, join on the generic base make file, which contains the actual
 # rules and stuff.
 

+echo "# From ../OS/Makefile-Base" >> $mft

 cat ../OS/Makefile-Base >> $mft || exit 1
 
 # If the new makefile is the same as the existing one, say so, and just
 cat ../OS/Makefile-Base >> $mft || exit 1
 
 # If the new makefile is the same as the existing one, say so, and just