[rs-commit] r251 - in /mod_scep/trunk: configure configure.ac

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Sun Jan  5 02:35:13 2020
New Revision: 251

Log:
Fix detection of X509_req_st.sig_alg.

Modified:
    mod_scep/trunk/configure
    mod_scep/trunk/configure.ac

Modified: mod_scep/trunk/configure
==============================================================================
--- mod_scep/trunk/configure	(original)
+++ mod_scep/trunk/configure	Sun Jan  5 02:35:13 2020
@@ -4500,6 +4500,8 @@
 $as_echo "yes" >&6; }
 
 fi
+CFLAGS="$CFLAGS $openssl_CFLAGS $apr_CFLAGS $apu_CFLAGS"
+CPPFLAGS="$CPPFLAGS $openssl_CPPFLAGS $apr_CPPFLAGS $apu_CPPFLAGS"
 LIBS="$LIBS $openssl_LIBS $apr_LIBS $apu_LIBS"
 
 # Checks for header files.
@@ -4915,7 +4917,11 @@
 
 
 # Checks for typedefs, structures, and compiler characteristics.
-ac_fn_c_check_member "$LINENO" "struct X509_req_st" "sig_alg" "ac_cv_member_struct_X509_req_st_sig_alg" "$ac_includes_default"
+ac_fn_c_check_member "$LINENO" "struct X509_req_st" "sig_alg" "ac_cv_member_struct_X509_req_st_sig_alg" "
+$ac_includes_default
+#include <openssl/x509.h>
+
+"
 if test "x$ac_cv_member_struct_X509_req_st_sig_alg" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
@@ -4924,7 +4930,11 @@
 
 
 fi
-ac_fn_c_check_member "$LINENO" "struct X509_req_info_st" "version" "ac_cv_member_struct_X509_req_info_st_version" "$ac_includes_default"
+ac_fn_c_check_member "$LINENO" "struct X509_req_info_st" "version" "ac_cv_member_struct_X509_req_info_st_version" "
+$ac_includes_default
+#include <openssl/x509.h>
+
+"
 if test "x$ac_cv_member_struct_X509_req_info_st_version" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF

Modified: mod_scep/trunk/configure.ac
==============================================================================
--- mod_scep/trunk/configure.ac	(original)
+++ mod_scep/trunk/configure.ac	Sun Jan  5 02:35:13 2020
@@ -52,13 +52,18 @@
 PKG_CHECK_MODULES(apr, apr-1 >= 1.4)
 PKG_CHECK_MODULES(apu, apr-util-1 >= 1.4)
 PKG_CHECK_MODULES(openssl, openssl >= 0.9.8)
+CFLAGS="$CFLAGS $openssl_CFLAGS $apr_CFLAGS $apu_CFLAGS"
+CPPFLAGS="$CPPFLAGS $openssl_CPPFLAGS $apr_CPPFLAGS $apu_CPPFLAGS"
 LIBS="$LIBS $openssl_LIBS $apr_LIBS $apu_LIBS"
 
 # Checks for header files.
 AC_CHECK_HEADERS([mod_ca.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_CHECK_MEMBERS([struct X509_req_st.sig_alg, struct X509_req_info_st.version])
+AC_CHECK_MEMBERS([struct X509_req_st.sig_alg, struct X509_req_info_st.version], [], [], [
+AC_INCLUDES_DEFAULT
+#include <openssl/x509.h>
+])
 
 # Checks for library functions.
 AC_CHECK_FUNCS([X509_REQ_get0_signature X509_REQ_set1_signature])