Check for openssl/conf.h

Check for presence of openssl/conf.h to support definition of fallback
functions in later patches.

diff --git a/configure b/configure
index 5d78f09..779c6fb 100755 (executable)
--- a/configure
+++ b/configure
@@ -8666,6 +8666,7 @@ $as_echo "#define HAVE_OPENSSL_SSL_H 1" >>confdefs.h
 
     for ac_header in \
       openssl/asn1.h \
+      openssl/conf.h \
       openssl/crypto.h \
       openssl/err.h \
       openssl/evp.h \

diff --git a/configure.ac b/configure.ac
index 678bb16..b9fed71 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1105,6 +1105,7 @@ if test "x$WITH_OPENSSL" = xyes; then
 
     AC_CHECK_HEADERS( \
       openssl/asn1.h \
+      openssl/conf.h \
       openssl/crypto.h \
       openssl/err.h \
       openssl/evp.h \

diff --git a/src/include/autoconf.h.in b/src/include/autoconf.h.in
index f1b8c17..e0a3e50 100644 (file)
--- a/src/include/autoconf.h.in
+++ b/src/include/autoconf.h.in
@@ -251,6 +251,9 @@
 /* Define to 1 if you have the <openssl/asn1.h> header file. */
 #undef HAVE_OPENSSL_ASN1_H
 
+/* Define to 1 if you have the <openssl/conf.h> header file. */
+#undef HAVE_OPENSSL_CONF_H
+
 /* Define to 1 if you have the <openssl/crypto.h> header file. */
 #undef HAVE_OPENSSL_CRYPTO_H