Add protocol=smtps support to smtp transport.

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

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

-# $Cambridge: exim/src/scripts/Configure-Makefile,v 1.1 2004/10/06 15:07:40 ph10 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


@@ -78,10 +77,13 @@ mf=Makefile
 mft=$mf-t
 mftt=$mf-tt
 
 mft=$mf-t
 mftt=$mf-tt
 

+look_mf=lookups/Makefile.predynamic
+look_mft=${look_mf}-t
+

 # Ensure the temporary does not exist and start the new one by setting
 # the OSTYPE and ARCHTYPE variables.
 
 # Ensure the temporary does not exist and start the new one by setting
 # the OSTYPE and ARCHTYPE variables.
 

-rm -f $mft $mftt
+rm -f $mft $mftt $look_mf-t

 (echo "OSTYPE=$ostype"; echo "ARCHTYPE=$archtype"; echo "") > $mft || exit 1
 
 # Now concatenate the files to the temporary file. Copy the files using sed to
 (echo "OSTYPE=$ostype"; echo "ARCHTYPE=$archtype"; echo "") > $mft || exit 1
 
 # Now concatenate the files to the temporary file. Copy the files using sed to


@@ -109,6 +111,12 @@ do   if test -r ../$f
      fi
 done >> $mft || exit 1
 
      fi
 done >> $mft || exit 1
 

+# make the lookups Makefile with the definitions
+
+## prepend stuff here; eg: grep LOOKUP_ $mft > $look_mft
+## cat ../src/lookups/Makefile >> $look_mft
+cp ../src/lookups/Makefile $look_mft
+

 # See if there is a definition of EXIM_PERL in what we have built so far.
 # If so, run Perl to find the default values for PERL_CC, PERL_CCOPTS,
 # and PERL_LIBS. These need to be put at the top of the Makefile, so we rename
 # See if there is a definition of EXIM_PERL in what we have built so far.
 # If so, run Perl to find the default values for PERL_CC, PERL_CCOPTS,
 # and PERL_LIBS. These need to be put at the top of the Makefile, so we rename


@@ -129,6 +137,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,23 +160,26 @@ 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
 # update the timestamp. Otherwise remove the old and install the new.
 
 cat ../OS/Makefile-Base >> $mft || exit 1
 
 # If the new makefile is the same as the existing one, say so, and just
 # update the timestamp. Otherwise remove the old and install the new.
 

-if      [ -s $mf ] && cmp -s $mft $mf
+if      [ -s $mf ] && cmp -s $mft $mf && [ -s $look_mf ] && cmp -s $look_mft $look_mf

 then    echo ">>> rebuilt $mf unchanged"
         echo " "
         touch $mf || exit
         rm -f $mft
 then    echo ">>> rebuilt $mf unchanged"
         echo " "
         touch $mf || exit
         rm -f $mft

-elif    rm -f $mf
+elif    rm -f $mf $look_mf

         mv $mft $mf
         mv $mft $mf

-then    echo ">>> New $mf installed"
+       mv $look_mft $look_mf
+then    echo ">>> New $mf & $look_mf installed"

         echo '>>> Use "make makefile" if you need to force rebuilding of the makefile'
         echo " "
 else    echo " "
         echo "*** Failed to install $mf - see $mft"
         echo '>>> Use "make makefile" if you need to force rebuilding of the makefile'
         echo " "
 else    echo " "
         echo "*** Failed to install $mf - see $mft"

+       echo "    (or $look_mft)"

         echo " "
         exit 1;
 fi
         echo " "
         exit 1;
 fi