Handle absent tls_require_ciphers correctly.

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

diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile
index 24ba10823b4d7aa411fad5e110ab277e263783f2..3e901e6a6a8bb6f0b9b20e904dadc39f163c2f47 100755 (executable)
--- a/src/scripts/Configure-Makefile
+++ b/src/scripts/Configure-Makefile
@@ -117,6 +117,9 @@ done >> $mft || exit 1
 egrep "^[$st]*(AUTH|LOOKUP)_[A-Z0-9_]*[$st]*=[$st]*" $mft | \
   sed "s/[$st]*=/='/" | \
   sed "s/\$/'/" > $mftt
 egrep "^[$st]*(AUTH|LOOKUP)_[A-Z0-9_]*[$st]*=[$st]*" $mft | \
   sed "s/[$st]*=/='/" | \
   sed "s/\$/'/" > $mftt

+egrep "^[$st]*((USE_(OPENSSL|GNUTLS)_PC)|SUPPORT_TLS|USE_GNUTLS|PCRE_CONFIG)[$st]*=[$st]*" $mft | \
+  sed "s/[$st]*=/='/" | \
+  sed "s/\$/'/" >> $mftt

 if test -s $mftt
 then
   (
 if test -s $mftt
 then
   (


@@ -124,6 +127,26 @@ then
   . ./$mftt
   for var in `cut -d = -f 1 < $mftt`; do
     case $var in
   . ./$mftt
   for var in `cut -d = -f 1 < $mftt`; do
     case $var in

+
+      USE_*_PC)
+        eval "pc_value=\"\$$var\""
+        need_this=''
+        if [ ".$SUPPORT_TLS" = "." ]; then
+          # no TLS, not referencing
+          true
+        elif [ ".$var" = ".USE_GNUTLS_PC" ] && [ ".$USE_GNUTLS" != "." ]; then
+          need_this=t
+        elif [ ".$var" = ".USE_OPENSSL_PC" ] && [ ".$USE_GNUTLS" = "." ]; then
+          need_this=t
+        fi
+        if [ ".$need_this" != "." ]; then
+          tls_include=`pkg-config --cflags $pc_value`
+          tls_libs=`pkg-config --libs $pc_value`
+          echo "TLS_INCLUDE=$tls_include"
+          echo "TLS_LIBS=$tls_libs"
+        fi
+        ;;
+

       *_PC)
         eval "pc_value=\"\$$var\""
         base=`echo $var | sed 's/_PC$//'`
       *_PC)
         eval "pc_value=\"\$$var\""
         base=`echo $var | sed 's/_PC$//'`


@@ -149,6 +172,20 @@ then
           fi
         fi
         ;;
           fi
         fi
         ;;

+
+      PCRE_CONFIG)
+        case $PCRE_CONFIG in
+          yes|YES|y|Y)
+            cflags=`pcre-config --cflags`
+            libs=`pcre-config --libs`
+            if [ ".$cflags" != "." ]; then
+              echo "INCLUDE += $cflags"
+            fi
+            echo "PCRE_LIBS=$libs"
+            ;;
+        esac
+        ;;
+

     esac
   done
   echo "# End of pkg-config fixups"
     esac
   done
   echo "# End of pkg-config fixups"