X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=configure.ac;h=d2c2e7021b757ff01af6115c212139c6dfa23e2d;hp=1bce3f41f40f5605c9d158bf0ddbcedaa4c559aa;hb=HEAD;hpb=a75ed01852de52cf0f93c7db964c66977966f096 diff --git a/configure.ac b/configure.ac index 1bce3f41..d2c2e702 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ dnl Template file for GNU Autoconf -dnl Copyright (C) 1995, 1996, 1997, 2001, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 1995, 1996, 1997, 2001, 2007, 2008, 2009, 2010, 2011, 2012, +dnl 2013, 2014 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 @@ -29,8 +30,8 @@ dnl dnl Process this file with autoconf to produce a configure script. dnl -AC_INIT([wget], - [1.12-devel], +AC_INIT([wget], + m4_esyscmd([build-aux/git-version-gen .tarball-version]), [bug-wget@gnu.org]) AC_PREREQ(2.61) @@ -40,18 +41,14 @@ dnl AC_MSG_NOTICE([configuring for GNU Wget $PACKAGE_VERSION]) AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_AUX_DIR([.]) +AC_CONFIG_AUX_DIR([build-aux]) -dnl -dnl Automake setup -dnl -AM_INIT_AUTOMAKE(1.9) +AC_CONFIG_SRCDIR([src/wget.h]) dnl -dnl Gettext +dnl Automake setup dnl -AM_GNU_GETTEXT([external],[need-ngettext]) -AM_GNU_GETTEXT_VERSION([0.16.1]) +AM_INIT_AUTOMAKE([1.9]) dnl dnl Get cannonical host @@ -64,8 +61,16 @@ dnl dnl Process features. dnl +AC_ARG_WITH(libpsl, + AS_HELP_STRING([--without-libpsl], + [disable support for libpsl cookie checking.])) + 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], @@ -89,13 +94,6 @@ ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes) test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE([ENABLE_DEBUG], 1, [Define if you want the debug output support compiled in.]) -wget_need_md5=no - -case "${ENABLE_OPIE}${ENABLE_DIGEST}" in -*yes*) - wget_need_md5=yes -esac - dnl dnl Find the compiler dnl @@ -107,11 +105,19 @@ test -z "$CC" && cc_specified=yes AC_PROG_CC AM_PROG_CC_C_O AC_AIX + gl_EARLY -md5_EARLY + +dnl +dnl Gettext +dnl +AM_GNU_GETTEXT([external],[need-ngettext]) +AM_GNU_GETTEXT_VERSION([0.17]) AC_PROG_RANLIB +AC_PROG_LEX + dnl Turn on optimization by default. Specifically: dnl dnl if the user hasn't specified CFLAGS, then @@ -158,18 +164,20 @@ dnl AC_HEADER_STDBOOL AC_CHECK_HEADERS(unistd.h sys/time.h) AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h) -AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h) +AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h) + +AC_CHECK_DECLS(h_errno,,,[#include ]) dnl 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. @@ -192,11 +200,11 @@ gl_INIT dnl dnl Checks for library functions. dnl -AC_FUNC_ALLOCA AC_FUNC_MMAP AC_FUNC_FSEEKO -AC_CHECK_FUNCS(strptime timegm snprintf vsnprintf vasprintf drand48) -AC_CHECK_FUNCS(strtoll usleep ftello sigblock sigsetjmp memrchr) +AC_CHECK_FUNCS(strptime timegm vsnprintf vasprintf drand48 pathconf) +AC_CHECK_FUNCS(strtoll usleep ftello sigblock sigsetjmp memrchr wcwidth mbtowc) +AC_CHECK_FUNCS(sleep symlink utime) if test x"$ENABLE_OPIE" = xyes; then AC_LIBOBJ([ftp-opie]) @@ -210,149 +218,165 @@ AC_DEFINE([HAVE_STRCASECMP], 1, [Define to 1 if you have the `strcasecmp' functi AC_DEFINE([HAVE_STRNCASECMP], 1, [Define to 1 if you have the `strncasecmp' function.]) AC_DEFINE([HAVE_STRDUP], 1, [Define to 1 if you have the `strdup' function.]) AC_DEFINE([HAVE_ISATTY], 1, [Define to 1 if you have the `isatty' function.]) -AC_DEFINE([HAVE_SYMLINK], 1, [Define to 1 if you have the `symlink' function.]) dnl dnl Call Wget-specific macros defined in aclocal. dnl WGET_STRUCT_UTIMBUF -WGET_SOCKLEN_T WGET_FNMATCH WGET_NANOSLEEP WGET_POSIX_CLOCK WGET_NSL_SOCKET +dnl Deal with specific hosts +case $host_os in + *mingw32* ) + 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], [ - 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 - dnl dlopen(), but HP-UX uses shl_load(). - AC_CHECK_LIB(dl, dlopen, [], [ - AC_CHECK_LIB(dl, shl_load) - ]) - - dnl Now actually check for -lssl +AS_IF([test x"$with_libpsl" != xno], [ + with_libpsl=yes + AC_CHECK_LIB([psl], [psl_builtin]) +]) + +AS_IF([test x"$with_zlib" != xno], [ + with_zlib=yes + AC_CHECK_LIB(z, compress) +]) + +AS_IF([test x"$with_ssl" = xopenssl], [ + 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 + dnl dlopen(), but HP-UX uses shl_load(). + AC_CHECK_LIB(dl, dlopen, [], [ + AC_CHECK_LIB(dl, shl_load) + ]) + + 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], [ - #include - #include - #include - #include - #include - #include - #include +#include +#include +#include +#include +#include +#include +#include ], [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 + ]) + +], [ + # --with-ssl is not openssl: check if it's no + AS_IF([test x"$with_ssl" != xno], [ + dnl default is -lgnutls + with_ssl=gnutls + + dnl Now actually check for -lgnutls + 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=gnutls was given, but GNUTLS is not available.]) fi - ]) # endif: --with-ssl == no? -]) # endif: --with-ssl == gnutls? + 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 + ENABLE_NTLM=yes AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.]) AC_LIBOBJ([http-ntlm]) fi else - dnl If SSL is unavailable and the user explicitly requested NTLM, - dnl abort. - if test x"$ENABLE_NTLM" = xyes - then - AC_MSG_ERROR([NTLM authorization requested and OpenSSL not found; aborting]) - fi -fi - -dnl -dnl Find an MD5 implementation. Since Wget rarely needs MD5, we try -dnl to use an existing library implementation to save on code size. -dnl - -if test x"$wget_need_md5" = xyes -then - dnl This should be moved to an AC_DEFUN, but I'm not sure how to - dnl manipulate MD5_OBJ from the defun. - - AC_LIBOBJ([gen-md5]) - found_md5=no - - dnl Check for the system MD5 library on Solaris. We don't check for - dnl something simple like "MD5Update" because there are a number of - dnl MD5 implementations that use that name, but have an otherwise - dnl incompatible interface. md5_calc is, hopefully, specific to the - dnl Solaris MD5 library. - if test x"$found_md5" = xno; then - AC_CHECK_LIB(md5, md5_calc, [ - dnl Some installations have bogus in the compiler's - dnl include path, making the system md5 library useless. - AC_MSG_CHECKING([for working md5.h]) - AC_COMPILE_IFELSE([#include - ], [ - AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_SOLARIS_MD5], 1, [Define when using Solaris MD5.]) - LIBS="-lmd5 $LIBS" - found_md5=yes - AC_MSG_NOTICE([using the Solaris MD5 implementation]) - ], [AC_MSG_RESULT(no)]) - ]) - fi + AC_CHECK_LIB(nettle, nettle_md4_init, [HAVE_NETTLE=yes], [HAVE_NETTLE=no; AC_MSG_WARN(*** libnettle was not found. You will not be able to use NTLM)]) - dnl Then see if we're linking OpenSSL anyway; if yes, use its md5 - dnl implementation. - if test x"$found_md5" = xno; then - if test x"$LIBSSL" != x; then - AC_DEFINE([HAVE_OPENSSL_MD5], 1, [Define when using OpenSSL MD5.]) - found_md5=yes - AC_MSG_NOTICE([using the OpenSSL MD5 implementation]) + if test x"$HAVE_NETTLE" = xyes + then + AC_SUBST(NETTLE_LIBS, "-lnettle") + AC_DEFINE([HAVE_NETTLE], [1], [Use libnettle]) + if test x"$ENABLE_NTLM" != xno + then + ENABLE_NTLM=yes + AC_DEFINE([ENABLE_NTLM], 1, + [Define if you want the NTLM authorization support compiled in.]) + AC_LIBOBJ([http-ntlm]) + LIBS="$NETTLE_LIBS $LIBS" + fi + else + dnl If SSL is unavailable and the user explicitly requested NTLM, + dnl abort. + if test x"$ENABLE_NTLM" = xyes + then + AC_MSG_ERROR([NTLM authorization requested and SSL not enabled; aborting]) fi fi - - dnl If none of the above worked, use the one we ship with Wget. - if test x"$found_md5" = xno; then - AC_DEFINE([HAVE_BUILTIN_MD5], 1, [Define when using built-in MD5.]) - found_md5=yes - AC_MSG_NOTICE([using the built-in (GNU) MD5 implementation]) - AC_C_BIGENDIAN - md5_INIT - fi - AC_DEFINE([HAVE_MD5], 1, [Define if we're compiling support for MD5.]) fi + dnl ********************************************************************** dnl Checks for IPv6 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 @@ -387,13 +411,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]) @@ -419,17 +436,6 @@ elif test "x$force_ipv6" = "xyes"; then AC_MSG_ERROR([IPv6 support requested but not found; aborting]) fi - -dnl -dnl Set of available languages. -dnl -dnl Originally this used to be static, looking like this: -dnl ALL_LINGUAS="cs de hr it ..." -dnl The downside was that configure needed to be rebuilt whenever a -dnl new language was added. -dnl -ALL_LINGUAS="en@quot en@boldquot $(cd ${srcdir}/po && ls *.po | grep -v 'en@.*quot' | sed -e 's/\.po$//' | tr '\012' ' ')" - dnl dnl Find makeinfo. We used to provide support for Emacs processing dnl Texinfo using `emacs -batch -eval ...' where makeinfo is @@ -454,11 +460,139 @@ else fi AC_SUBST(COMMENT_IF_NO_POD2MAN) + +dnl +dnl Check for IDN/IRIs +dnl + +AC_ARG_ENABLE(iri, + AC_HELP_STRING([--disable-iri],[disable IDN/IRIs support]), + [case "${enable_iri}" in + no) + dnl Disable IRIs checking + AC_MSG_NOTICE([disabling IRIs at user request]) + iri=no + ;; + yes) + dnl IRIs explicitly enabled + iri=yes + force_iri=yes + ;; + auto) + dnl Auto-detect IRI + iri=yes + ;; + *) + AC_MSG_ERROR([Invalid --enable-iri argument \`$enable_iri']) + ;; + esac + ], [ + dnl If nothing is specified, assume auto-detection + iri=yes + ] +) + +AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]], + [Support IDN/IRIs (needs GNU Libidn)]), + libidn=$withval, libidn="") +AS_IF([test "X$iri" != "Xno"],[ + AM_ICONV + + if test "X$am_cv_func_iconv" != "Xyes"; then + iri=no + if test "X$force_iri" = "Xyes"; then + AC_MSG_ERROR([Libiconv is required for IRIs support]) + else + AC_MSG_NOTICE([disabling IRIs because libiconv wasn't found]) + fi + fi +],[ # else + # For some reason, this seems to be set even when we don't check. + # Explicitly unset. + LIBICONV= +]) + +if test "X$iri" != "Xno"; then + if test "$libidn" != ""; then + LDFLAGS="${LDFLAGS} -L$libidn/lib" + CPPFLAGS="${CPPFLAGS} -I$libidn/include" + fi + + # If idna.h can't be found, check to see if it was installed under + # /usr/include/idn (OpenSolaris, at least, places it there). + # Check for idn-int.h in that case, because idna.h won't find + # idn-int.h until we've decided to add -I/usr/include/idn. + AC_CHECK_HEADER(idna.h, , + [AC_CHECK_HEADER(idn/idn-int.h, + [CPPFLAGS="${CPPFLAGS} -I/usr/include/idn"], + [iri=no])] + ) + + if test "X$iri" != "Xno"; then + AC_CHECK_LIB(idn, stringprep_check_version, + [iri=yes LIBS="${LIBS} -lidn"], iri=no) + fi + + if test "X$iri" != "Xno" ; then + AC_DEFINE([ENABLE_IRI], 1, [Define if IRI support is enabled.]) + AC_MSG_NOTICE([Enabling support for IRI.]) + else + AC_MSG_WARN([Libidn not found]) + 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 +dnl Check for PCRE +dnl + +AC_CHECK_HEADER(pcre.h, + AC_CHECK_LIB(pcre, pcre_compile, + [LIBS="${LIBS} -lpcre" + AC_DEFINE([HAVE_LIBPCRE], 1, + [Define if libpcre is available.]) + ]) +) + + +dnl Needed by src/Makefile.am +AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"]) + + dnl 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 + +AC_MSG_NOTICE([Summary of build options: + + Version: $PACKAGE_VERSION + Host OS: $host_os + Install prefix: $prefix + Compiler: $CC + CFlags: $CFLAGS $CPPFLAGS + LDFlags: $LDFLAGS + Libs: $LIBS + SSL: $with_ssl + Zlib: $with_zlib + PSL: $with_libpsl + Digest: $ENABLE_DIGEST + NTLM: $ENABLE_NTLM + OPIE: $ENABLE_OPIE + Debugging: $ENABLE_DEBUG +])