X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/7dc8d146a675f52b441310e731314d86c66b2114..db1d45ff1e5f3d83d24e75400a157d5fbc86d1c7:/src/scripts/Configure-Makefile

diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile
index 2b8a9bcb5..96a6cce22 100755
--- a/src/scripts/Configure-Makefile
+++ b/src/scripts/Configure-Makefile
@@ -29,16 +29,6 @@ fi
 
 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.
@@ -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.
-if echo 1 | grep -E 1 >/dev/null; then
+if [ "$ostype" != "SunOS5" ] ; then
   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
-
-#            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
         ;;
@@ -305,23 +284,32 @@ then
 fi
 rm -f $mftt
 
+#XXX 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
+
+
 # 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
-  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
- miscmods   SUPPORT	SPF DMARC
+ miscmods   SUPPORT	ARC _DKIM DMARC RADIUS SPF
 END
 
 # See if there is a definition of EXIM_PERL in what we have built so far.