Browse code

Add check for X509_VERIFY_PARAM_new

Shawn Webb authored on 2014/05/16 23:57:39
Showing 3 changed files
... ...
@@ -232,6 +232,9 @@
232 232
 /* Define to '1' if you have the curses.h library */
233 233
 #undef HAVE_LIBPDCURSES
234 234
 
235
+/* Define to 1 if you have the `ssl' library (-lssl). */
236
+#undef HAVE_LIBSSL
237
+
235 238
 /* Define to 1 if you have the 'libxml2' library (-lxml2). */
236 239
 #undef HAVE_LIBXML2
237 240
 
... ...
@@ -16798,6 +16798,54 @@ else
16798 16798
 fi
16799 16799
 
16800 16800
 
16801
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X509_VERIFY_PARAM_new in -lssl" >&5
16802
+$as_echo_n "checking for X509_VERIFY_PARAM_new in -lssl... " >&6; }
16803
+if ${ac_cv_lib_ssl_X509_VERIFY_PARAM_new+:} false; then :
16804
+  $as_echo_n "(cached) " >&6
16805
+else
16806
+  ac_check_lib_save_LIBS=$LIBS
16807
+LIBS="-lssl -lcrypto $LIBS"
16808
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16809
+/* end confdefs.h.  */
16810
+
16811
+/* Override any GCC internal prototype to avoid an error.
16812
+   Use char because int might match the return type of a GCC
16813
+   builtin and then its argument prototype would still apply.  */
16814
+#ifdef __cplusplus
16815
+extern "C"
16816
+#endif
16817
+char X509_VERIFY_PARAM_new ();
16818
+int
16819
+main ()
16820
+{
16821
+return X509_VERIFY_PARAM_new ();
16822
+  ;
16823
+  return 0;
16824
+}
16825
+_ACEOF
16826
+if ac_fn_c_try_link "$LINENO"; then :
16827
+  ac_cv_lib_ssl_X509_VERIFY_PARAM_new=yes
16828
+else
16829
+  ac_cv_lib_ssl_X509_VERIFY_PARAM_new=no
16830
+fi
16831
+rm -f core conftest.err conftest.$ac_objext \
16832
+    conftest$ac_exeext conftest.$ac_ext
16833
+LIBS=$ac_check_lib_save_LIBS
16834
+fi
16835
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_X509_VERIFY_PARAM_new" >&5
16836
+$as_echo "$ac_cv_lib_ssl_X509_VERIFY_PARAM_new" >&6; }
16837
+if test "x$ac_cv_lib_ssl_X509_VERIFY_PARAM_new" = xyes; then :
16838
+  cat >>confdefs.h <<_ACEOF
16839
+#define HAVE_LIBSSL 1
16840
+_ACEOF
16841
+
16842
+  LIBS="-lssl $LIBS"
16843
+
16844
+else
16845
+  as_fn_error $? "Your OpenSSL installation is missing the X509_VERIFY_PARAM function. Please upgrade to a more recent version of OpenSSL." "$LINENO" 5
16846
+fi
16847
+
16848
+
16801 16849
 LDFLAGS="$save_LDFLAGS"
16802 16850
 CFLAGS="$save_CFLAGS"
16803 16851
 
... ...
@@ -39,5 +39,8 @@ AC_CHECK_LIB([ssl], [SSL_library_init], [have_ssl="yes"], [AC_MSG_ERROR([Your Op
39 39
 
40 40
 AC_CHECK_LIB([crypto], [EVP_EncryptInit], [have_crypto="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])])
41 41
 
42
+dnl OpenSSL 0.9.8 is the minimum required version due to X509_VERIFY_PARAM
43
+AC_CHECK_LIB([ssl], [X509_VERIFY_PARAM_new], [], [AC_MSG_ERROR([Your OpenSSL installation is missing the X509_VERIFY_PARAM function. Please upgrade to a more recent version of OpenSSL.])], [-lcrypto])
44
+
42 45
 LDFLAGS="$save_LDFLAGS"
43 46
 CFLAGS="$save_CFLAGS"