X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=configure.ac;h=eb1b8b7d6d10ca1ea18a3a67232d787c95273f4b;hp=1cdba2f4519b9981202ebc1c63647c730016baab;hb=44ea82bc67a2f16cb485b51342f8265d3717c18d;hpb=23ebf5c52a3a2063269e86171c15088a421f6d28 diff --git a/configure.ac b/configure.ac index 1cdba2f4..eb1b8b7d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Template file for GNU Autoconf -dnl Copyright (C) 1995, 1996, 1997, 2001, 2007, 2008, 2009, 2010 Free -dnl Software Foundation, Inc. +dnl Copyright (C) 1995, 1996, 1997, 2001, 2007, 2008, 2009, 2010, 2011 +dnl Free Software Foundation, Inc. dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -62,7 +62,11 @@ dnl Process features. dnl AC_ARG_WITH(ssl, -[[ --without-ssl disable SSL autodetection]]) +[[ --without-ssl disable SSL autodetection + --with-ssl={gnutls,openssl} specify the SSL backend. GNU TLS is the default.]]) + +AC_ARG_WITH(zlib, +[[ --without-zlib disable zlib ]]) AC_ARG_ENABLE(opie, [ --disable-opie disable support for opie or s/key FTP login], @@ -165,11 +169,11 @@ dnl Check sizes of integer types. These are used to find n-bit dnl integral types on older systems that fail to provide intN_t and dnl uintN_t typedefs. dnl -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) -AC_CHECK_SIZEOF(long long) -AC_CHECK_SIZEOF(void *) +AC_CHECK_SIZEOF([short]) +AC_CHECK_SIZEOF([int]) +AC_CHECK_SIZEOF([long]) +AC_CHECK_SIZEOF([long long]) +AC_CHECK_SIZEOF([void *]) dnl dnl Checks for non-universal or system-specific types. @@ -196,7 +200,7 @@ AC_FUNC_MMAP AC_FUNC_FSEEKO AC_CHECK_FUNCS(strptime timegm vsnprintf vasprintf drand48) AC_CHECK_FUNCS(strtoll usleep ftello sigblock sigsetjmp memrchr wcwidth mbtowc) -AC_CHECK_FUNCS(sleep symlink) +AC_CHECK_FUNCS(sleep symlink utime) if test x"$ENABLE_OPIE" = xyes; then AC_LIBOBJ([ftp-opie]) @@ -223,30 +227,24 @@ WGET_NSL_SOCKET dnl Deal with specific hosts case $host_os in *mingw32* ) - AC_SUBST(W32LIBS, '-lws2_32') + LIBS+=' -lws2_32' AC_LIBOBJ([mswindows]) ;; esac + dnl dnl Checks for libraries. dnl -AS_IF([test x"$with_ssl" = xgnutls], [ - dnl Now actually check for -lssl - AC_LIB_HAVE_LINKFLAGS([gnutls], [], [ -#include - ], [gnutls_global_init()]) - if test x"$LIBGNUTLS" != x - then - AC_MSG_NOTICE([compiling in support for SSL via GnuTLS]) - AC_LIBOBJ([gnutls]) - else - AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.]) - fi -], [ - # --with-ssl is not gnutls: check if it's no - AS_IF([test x"$with_ssl" != xno], [ +AS_IF([test x"$with_zlib" != xno], [ + AC_CHECK_LIB(z, compress) +]) + +AS_IF([test x"$with_ssl" = xopenssl], [ + dnl some versions of openssl use zlib compression + AC_CHECK_LIB(z, compress) + dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library dnl doesn't record its dependency on libdl, so we need to make sure dnl -ldl ends up in LIBS on systems that have it. Most OSes use @@ -255,8 +253,35 @@ AS_IF([test x"$with_ssl" = xgnutls], [ AC_CHECK_LIB(dl, shl_load) ]) - dnl Now actually check for -lssl - AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [ + ssl_found=no + case $host_os in + *mingw32* ) + dnl prefer link to openssl dlls if possible. if not then fallback on static libs. if not then error + + AC_CHECK_LIB(eay32, EVP_MD_CTX_init) + if test x"$ac_cv_lib_eay32_EVP_MD_CTX_init" != xno + then + AC_CHECK_LIB(ssl32, SSL_connect, [ + ssl_found=yes + AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)]) + AC_LIBOBJ([openssl]) + LIBS="${LIBS} -lssl32" + AC_DEFINE([HAVE_LIBSSL32], [1], [Define to 1 if you have the `ssl32' library (-lssl32).]) + ], + AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found])) + + else + LIBS+=' -lgdi32' + dnl fallback and test static libs + fi + dnl add zdll lib as dep for above tests? + ;; + esac + +AS_IF([test x$ssl_found != xyes], +[ + dnl Now actually check for -lssl if it wasn't already found + AC_LIB_HAVE_LINKFLAGS([ssl], [crypto z], [ #include #include #include @@ -267,18 +292,45 @@ AS_IF([test x"$with_ssl" = xgnutls], [ ], [SSL_library_init ()]) if test x"$LIBSSL" != x then + ssl_found=yes AC_MSG_NOTICE([compiling in support for SSL via OpenSSL]) AC_LIBOBJ([openssl]) + LIBS="$LIBSSL $LIBS" elif test x"$with_ssl" != x then - AC_MSG_ERROR([--with-ssl was given, but SSL is not available.]) + AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.]) fi - ]) # endif: --with-ssl == no? -]) # endif: --with-ssl == gnutls? +]) +], [ + # --with-ssl is not gnutls: check if it's no + AS_IF([test x"$with_ssl" != xno], [ + dnl Now actually check for -lssl + + AC_CHECK_LIB(z, compress) + AC_CHECK_LIB(gpg-error, gpg_err_init) + AC_CHECK_LIB(gcrypt, gcry_control) + + dnl Now actually check for -lssl + AC_LIB_HAVE_LINKFLAGS([gnutls], [], [ +#include + ], [gnutls_global_init()]) + if test x"$LIBGNUTLS" != x + then + ssl_found=yes + AC_MSG_NOTICE([compiling in support for SSL via GnuTLS]) + AC_LIBOBJ([gnutls]) + LIBS="$LIBGNUTLS $LIBS" + else + AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.]) + fi + + AC_CHECK_FUNCS(gnutls_priority_set_direct) + ]) # endif: --with-ssl == no? +]) # endif: --with-ssl == openssl? dnl Enable NTLM if requested and if SSL is available. -if test x"$LIBSSL" != x +if test x"$LIBSSL" != x || test "$ac_cv_lib_ssl32_SSL_connect" = yes then if test x"$ENABLE_NTLM" != xno then @@ -301,9 +353,9 @@ dnl ********************************************************************** dnl dnl We test for IPv6 by checking, in turn, for availability of -dnl getaddrinfo, presence of the INET6 address/protocol family, and -dnl the existence of struct sockaddr_in6. If any of them is missing, -dnl IPv6 is disabled, and the code reverts to old-style gethostbyname. +dnl presence of the INET6 address/protocol family and the existence of +dnl struct sockaddr_in6. If any of them is missing, IPv6 is disabled, +dnl and the code reverts to old-style gethostbyname. dnl dnl If --enable-ipv6 is explicitly specified on the configure command dnl line, we check for IPv6 and abort if not found. If --disable-ipv6 @@ -338,13 +390,6 @@ AC_ARG_ENABLE(ipv6, ] ) -if test "X$ipv6" = "Xyes"; then - AC_CHECK_FUNCS(getaddrinfo, [], [ - AC_MSG_NOTICE([Disabling IPv6 support: your system does not support getaddrinfo(3)]) - ipv6=no - ]) -fi - if test "X$ipv6" = "Xyes"; then PROTO_INET6([], [ AC_MSG_NOTICE([Disabling IPv6 support: your system does not support the PF_INET6 protocol family]) @@ -475,7 +520,19 @@ if test "X$iri" != "Xno"; then fi fi +dnl +dnl Check for UUID +dnl + +AC_CHECK_HEADER(uuid/uuid.h, + AC_CHECK_LIB(uuid, uuid_generate, + [LIBS="${LIBS} -luuid" + AC_DEFINE([HAVE_LIBUUID], 1, + [Define if libuuid is available.]) + ]) +) + dnl Needed by src/Makefile.am AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"]) @@ -485,6 +542,6 @@ dnl Create output dnl AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile po/Makefile.in tests/Makefile tests/WgetTest.pm - lib/Makefile windows/Makefile]) + lib/Makefile]) AC_CONFIG_HEADERS([src/config.h]) AC_OUTPUT