* Add test for ca-bundle.crt for systems that provide it.

   * Add %libresslflags% to the set of extracflagsnq in the kerberos build
     of PC-Alpine. This adds S/MIME support to that build. Fixed by
     Ulf-Dietrich Braumann.

3 files changed, 3 insertions, 3 deletions

diff --git a/build.bat b/build.bat
index baab5e5b..5382df5a 100644
--- a/build.bat
+++ b/build.bat
@@ -88,7 +88,7 @@ echo including LDAP functionality
 set ldapflags=-I\"%ALPINE_LDAP%\"\inckit -DENABLE_LDAP
 set ldaplibes=\"%ALPINE_LDAP%\"\binaries\release\ldap32.lib
 :noldapw2k
-set extracflagsnq=/DWINVER=0x0501 /Zi -Od %ldapflags% -D_USE_32BIT_TIME_T -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DSPCFC_WINVER=\"\\\" 2000\\\"\" -DSPCL_REMARKS=\"\\\" with krb5\\\"\"
+set extracflagsnq=/DWINVER=0x0501 /Zi -Od %ldapflags% %libresslflags% -D_USE_32BIT_TIME_T -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DSPCFC_WINVER=\"\\\" 2000\\\"\" -DSPCL_REMARKS=\"\\\" with krb5\\\"\"
 set extralibes="secur32.lib %libresslextralibes%"
 set extralibesalpine="secur32.lib crypt32.lib %ldaplibes% %libressllibes%"
 set extrarcflags="/D_PCP_W2K"
diff --git a/configure b/configure
index e550fd15..dfec3a52 100755
--- a/configure
+++ b/configure
@@ -21818,7 +21818,7 @@ _ACEOF
   SSL_CERT_LINK="no"
   if test -z "`ls ${certdir} | $EGREP '^[0-9A-Fa-f]{8}\.[0-9]'`" ; then
      SSL_BUNDLE_EXISTS="no"
-     SSL_PEM="factory.pem ca-bundle.pem"
+     SSL_PEM="factory.pem ca-bundle.pem ca-bundle.crt"
      for SSL_BUNDLE in $SSL_PEM
      do
        if test -f ${certdir}/${SSL_BUNDLE} ; then
diff --git a/configure.ac b/configure.ac
index 4c3d3ef1..92a584d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2002,7 +2002,7 @@ else
   SSL_CERT_LINK="no"
   if test -z "`ls ${certdir} | $EGREP '^@<:@0-9A-Fa-f@:>@{8}\.@<:@0-9@:>@'`" ; then
      SSL_BUNDLE_EXISTS="no"
-     SSL_PEM="factory.pem ca-bundle.pem"
+     SSL_PEM="factory.pem ca-bundle.pem ca-bundle.crt"
      for SSL_BUNDLE in $SSL_PEM
      do
        if test -f ${certdir}/${SSL_BUNDLE} ; then