exim-filter dynamic module

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

diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile
index 2b8a9bcb5a25c461ed272ecf3b0798edad7097bd..74f8dda47af9f16b9357e1a17620291a95bd15c6 100755 (executable)
--- a/src/scripts/Configure-Makefile
+++ b/src/scripts/Configure-Makefile
@@ -29,16 +29,6 @@ fi
 
 archtype=`../scripts/arch-type` || exit 1
 
 
 archtype=`../scripts/arch-type` || exit 1
 

-# Linux now whines about egrep, saying "use grep -E".
-# Solarix doesn't support -E on grep.  Thanks so much for
-# going non-back-compatible, Linux.
-if echo 1 | grep -E 1 >/dev/null; then
-  egrep="grep -E"
-else
-  egrep="egrep"
-fi
-
-

 # Now test for either the non-existence of Makefile, or for any of its
 # components being newer. Note that the "newer" script gives the right
 # answer (for our purposes) when the first file is non-existent.
 # Now test for either the non-existence of Makefile, or for any of its
 # components being newer. Note that the "newer" script gives the right
 # answer (for our purposes) when the first file is non-existent.


@@ -76,7 +66,7 @@ fi
 # Linux now whines about egrep, saying "use grep -E".
 # Solarix doesn't support -E on grep.  Thanks so much for
 # going non-back-compatible, Linux.
 # Linux now whines about egrep, saying "use grep -E".
 # Solarix doesn't support -E on grep.  Thanks so much for
 # going non-back-compatible, Linux.

-if echo 1 | grep -E 1 >/dev/null; then
+if [ "$ostype" != "SunOS5" ] ; then

   egrep="grep -E"
 else
   egrep="egrep"
   egrep="grep -E"
 else
   egrep="egrep"


@@ -257,17 +247,6 @@ then
           yes|YES|y|Y)
             echo >&2 "pcre is no longer supported; migrate to pcre2"
             exit 1
           yes|YES|y|Y)
             echo >&2 "pcre is no longer supported; migrate to pcre2"
             exit 1

-
-#            cflags=`pcre-config --cflags`
-#            if [ $? -ne 0 ]; then
-#              echo >&2 "*** Missing pcre-config for regular expression support"
-#              exit 1
-#            fi
-#            libs=`pcre-config --libs`
-#            if [ ".$cflags" != "." ]; then
-#              echo "INCLUDE += $cflags"
-#            fi
-#            echo "PCRE_LIBS=$libs"

             ;;
         esac
         ;;
             ;;
         esac
         ;;


@@ -305,23 +284,38 @@ then
 fi
 rm -f $mftt
 
 fi
 rm -f $mftt
 

+
+# look for RADIUS in $mft; add a SUPPORT_
+if $egrep -q "^RADIUS_CONFIG_FILE" $mft; then
+  echo "# radius fixup"
+  $egrep -q "^SUPPORT_RADIUS" $mft || echo "SUPPORT_RADIUS=yes" >> $mft
+fi
+# also PERL
+if $egrep -q "^EXIM_PERL" $mft; then
+  echo "# perl fixup"
+  $egrep -q "^SUPPORT_PERL" $mft || echo "SUPPORT_PERL=yes" >> $mft
+fi
+
+

 # make the lookups Makefile with the definitions
 # the auxiliary script generates $look_mf_post from $look_mf_pre
 
 cp ../src/lookups/Makefile $look_mf_pre
 ../scripts/lookups-Makefile
 
 # make the lookups Makefile with the definitions
 # the auxiliary script generates $look_mf_post from $look_mf_pre
 
 cp ../src/lookups/Makefile $look_mf_pre
 ../scripts/lookups-Makefile
 

+# make the Makefiles for routers, transports, auths and miscmods
+#

 while read class classdef names
 do
   cp ../src/$class/Makefile $class/Makefile.predynamic
 while read class classdef names
 do
   cp ../src/$class/Makefile $class/Makefile.predynamic

-  CLASS=$class CLASSDEF=$classdef DRNAMES="$names" ../scripts/drivers-Makefile
+  CLASS=$class CLASSDEF=$classdef DRNAMES="$names" EGREP="$egrep" ../scripts/drivers-Makefile

   mv $class/Makefile.postdynamic $class/Makefile
   rm $class/Makefile.predynamic
 done <<-END
  routers    ROUTER     ACCEPT DNSLOOKUP IPLITERAL IPLOOKUP MANUALROUTE QUERYPROGRAM REDIRECT
  transports TRANSPORT  APPENDFILE AUTOREPLY LMTP PIPE QUEUEFILE SMTP
  auths     AUTH        CRAM_MD5 CYRUS_SASL DOVECOT EXTERNAL GSASL HEIMDAL_GSSAPI PLAINTEXT SPA TLS
   mv $class/Makefile.postdynamic $class/Makefile
   rm $class/Makefile.predynamic
 done <<-END
  routers    ROUTER     ACCEPT DNSLOOKUP IPLITERAL IPLOOKUP MANUALROUTE QUERYPROGRAM REDIRECT
  transports TRANSPORT  APPENDFILE AUTOREPLY LMTP PIPE QUEUEFILE SMTP
  auths     AUTH        CRAM_MD5 CYRUS_SASL DOVECOT EXTERNAL GSASL HEIMDAL_GSSAPI PLAINTEXT SPA TLS

- miscmods   SUPPORT    SPF DMARC
+ miscmods   SUPPORT    ARC _DKIM DMARC _EXIM_FILTER PAM PERL RADIUS _SIEVE_FILTER SPF

 END
 
 # See if there is a definition of EXIM_PERL in what we have built so far.
 END
 
 # See if there is a definition of EXIM_PERL in what we have built so far.


@@ -350,10 +344,27 @@ if [ "${EXIM_PERL}" != "" ] ; then
     exit 1;
   fi
 
     exit 1;
   fi
 

+  perl_cc="`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`"
+  perl_ccopts="`$PERL_COMMAND -MExtUtils::Embed -e ccopts`"
+  perl_libs="`$PERL_COMMAND -MExtUtils::Embed -e ldopts`"
+
+  # For the dynamic-module build, pull out all the -D & -I into another var,
+  # and -L (maybe & -l?) to another, both for feed to miscmods
+  # ending up as SUPPORT_PERL_INCLUDE & SUPPORT_PERL_LIB respectively
+
+  perl_cflags=`PERL_CCOPTS="$perl_ccopts" $PERL_COMMAND \
+               -e 'my @list = split(" ", $ENV{PERL_CCOPTS});' \
+               -e 'foreach (@list) {print "$_ " if (/^-[DI]/)}'`
+  perl_lflags=`PERL_LIBS="$perl_libs" $PERL_COMMAND \
+               -e 'my @list = split(" ", $ENV{PERL_LIBS});' \
+               -e 'foreach (@list) {print "$_ " if (/^-L/)}'`
+

   mv $mft $mftt
   mv $mft $mftt

-  echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft
-  echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts`" >>$mft
-  echo "PERL_LIBS=`$PERL_COMMAND -MExtUtils::Embed -e ldopts`" >>$mft
+  echo "PERL_CC=${perl_cc}" >>$mft
+  echo "PERL_CCOPTS=${perl_ccopts}" >>$mft
+  echo "PERL_LIBS=${perl_libs}" >>$mft
+  echo "PERL_CFLAGS=${perl_cflags}" >>$mft
+  echo "PERL_LFLAGS=${perl_lflags}" >>$mft

   echo "" >>$mft
   cat $mftt >> $mft
   rm -f $mftt
   echo "" >>$mft
   cat $mftt >> $mft
   rm -f $mftt