[svn] Renamed src/gen_sslfunc.c to src/openssl.c and src/gen_sslfunc.h to

[wget] / configure.in

diff --git a/configure.in b/configure.in
index 11f969eb5a2c3be363f42117d401b0ea3e246bb1..ecc45824f322eb3b686a44395b4077b89bbb8cd0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -230,6 +230,7 @@ WGET_STRUCT_UTIMBUF
 WGET_SOCKLEN_T
 WGET_FNMATCH
 WGET_NANOSLEEP
+WGET_POSIX_CLOCK
 WGET_NSL_SOCKET
 
 dnl
@@ -326,10 +327,20 @@ if test x"$with_ssl" != x"no"; then
     ssl_found_includes=no
     CPPFLAGS="$SSL_INCLUDES $wget_save_CPPFLAGS"
 
+    dnl Check for all the OpenSSL includes that Wget actually uses.
+    dnl This will prune both invalid installations and ancient
+    dnl versions of OpenSSL that we can't use.
     AC_MSG_CHECKING([for includes])
     AC_COMPILE_IFELSE([
 #include <openssl/ssl.h>
-#include <openssl/rsa.h>
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
+#include <openssl/des.h>
+#include <openssl/err.h>
+#include <openssl/md4.h>
+#include <openssl/pem.h>
+#include <openssl/rand.h>
+#include <openssl/x509.h>
     ], [
       AC_MSG_RESULT(found)
       ssl_found_includes=yes
@@ -395,7 +406,7 @@ main(){return 0;}
     AC_DEFINE([HAVE_SSL], 1,
               [Define if SSL support should be compiled in.])
     AC_SUBST(SSL_INCLUDES)
-    SSL_OBJ='gen_sslfunc$o'
+    SSL_OBJ='openssl$o'
     AC_SUBST(SSL_OBJ)
   else
     LDFLAGS=$wget_save_LDFLAGS