X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=configure.in;h=1e8fadfef66499cd096e1e0f3fd4d2b414f3a303;hb=c2c71c32cf7e75336bb45fc299658910e0f9f8af;hp=dbd019b0df9b4f9b8f8f2a0434fbfd7cfcb00fe5;hpb=e1679c65c2ee23ca9dc239f42faa6002585d13f7;p=wget diff --git a/configure.in b/configure.in index dbd019b0..1e8fadfe 100644 --- a/configure.in +++ b/configure.in @@ -1,9 +1,9 @@ dnl Template file for GNU Autoconf -dnl Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. +dnl Copyright (C) 1995, 1996, 1997, 2001, 2007 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 -dnl the Free Software Foundation; either version 2 of the License, or +dnl the Free Software Foundation; either version 3 of the License, or dnl (at your option) any later version. dnl This program is distributed in the hope that it will be useful, @@ -12,8 +12,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +dnl along with this program. If not, see . dnl In addition, as a special exception, the Free Software Foundation dnl gives permission to link the code of its release of Wget with the @@ -29,9 +28,14 @@ dnl dnl Process this file with autoconf to produce a configure script. dnl -AC_INIT(src/version.c) -AC_PREREQ(2.50) -AC_CONFIG_HEADER(src/config.h) +AC_INIT([src/version.c]) +AC_PREREQ(2.61) + +dnl Include the M4 macros we use. +builtin(include, [m4/wget.m4])dnl +builtin(include, [m4/lib-ld.m4])dnl +builtin(include, [m4/lib-link.m4])dnl +builtin(include, [m4/lib-prefix.m4])dnl dnl dnl What version of Wget are we building? @@ -52,42 +56,40 @@ AC_DEFINE_UNQUOTED([OS_TYPE], "$host_os", dnl dnl Process features. dnl -AC_ARG_WITH(socks, - [ --with-socks use the socks library], - [AC_DEFINE([HAVE_SOCKS], [], - [Define if you wish to compile with socks support.])] -) AC_ARG_WITH(ssl, -[[ --with-ssl[=SSL-ROOT] link with SSL support [default=auto] - --without-ssl disable SSL autodetection]]) +[[ --without-ssl disable SSL autodetection]]) AC_ARG_ENABLE(opie, [ --disable-opie disable support for opie or s/key FTP login], -USE_OPIE=$enableval, USE_OPIE=yes) -test x"${USE_OPIE}" = xyes && AC_DEFINE([USE_OPIE], [], +ENABLE_OPIE=$enableval, ENABLE_OPIE=yes) +test x"${ENABLE_OPIE}" = xyes && AC_DEFINE([ENABLE_OPIE], 1, [Define if you want the Opie support for FTP compiled in.]) AC_ARG_ENABLE(digest, [ --disable-digest disable support for HTTP digest authorization], -USE_DIGEST=$enableval, USE_DIGEST=yes) -test x"${USE_DIGEST}" = xyes && AC_DEFINE([USE_DIGEST], [], +ENABLE_DIGEST=$enableval, ENABLE_DIGEST=yes) +test x"${ENABLE_DIGEST}" = xyes && AC_DEFINE([ENABLE_DIGEST], 1, [Define if you want the HTTP Digest Authorization compiled in.]) +AC_ARG_ENABLE(ntlm, +[ --disable-ntlm disable support for NTLM authorization], +[ENABLE_NTLM=$enableval], [ENABLE_NTLM=auto]) + AC_ARG_ENABLE(debug, [ --disable-debug disable support for debugging output], ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes) -test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE([ENABLE_DEBUG], [], +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 "${USE_OPIE}${USE_DIGEST}" in +case "${ENABLE_OPIE}${ENABLE_DIGEST}" in *yes*) wget_need_md5=yes esac -if test x"$USE_OPIE" = xyes; then - OPIE_OBJ='ftp-opie$o' +if test x"$ENABLE_OPIE" = xyes; then + OPIE_OBJ='ftp-opie.o' fi AC_SUBST(OPIE_OBJ) @@ -110,15 +112,18 @@ test -z "$CFLAGS" && CFLAGS= auto_cflags=1 test -z "$CC" && cc_specified=yes AC_PROG_CC +AC_AIX +dnl Turn on optimization by default. Specifically: dnl dnl if the user hasn't specified CFLAGS, then -dnl if compiler is gcc, then use -O2 and some warning flags -dnl else use os-specific flags or -O -dnl +dnl if compiler is gcc, then +dnl use -O2 and some warning flags +dnl else +dnl use os-specific flags or -O if test -n "$auto_cflags"; then if test -n "$GCC"; then - CFLAGS="$CFLAGS -O2 -Wall -Wno-implicit" + CFLAGS="$CFLAGS -O2 -Wall" else case "$host_os" in *hpux*) CFLAGS="$CFLAGS +O3" ;; @@ -128,72 +133,59 @@ if test -n "$auto_cflags"; then fi fi -dnl -dnl Handle AIX -dnl -AC_AIX - -dnl -dnl Configure our included libtool and make sure it's regenerated when needed -dnl -AC_PROG_LIBTOOL -AC_SUBST(LIBTOOL_DEPS) - -dnl -dnl In case of {cyg,gnu}win32. Should be a _target_ test. -dnl Might also be erelevant for DJGPP. -dnl -case "$host_os" in - *win32) exeext='.exe';; - *) exeext='';; -esac -AC_SUBST(exeext) - -dnl -dnl Check if we can handle prototypes. -dnl -AM_C_PROTOTYPES - dnl dnl Checks for basic compiler characteristics. dnl AC_C_CONST AC_C_INLINE AC_C_VOLATILE -AC_C_BIGENDIAN + +dnl Check for basic headers, even though we expect them to exist and +dnl #include them unconditionally in the code. Their detection is +dnl still needed because test programs used by Autoconf macros check +dnl for STDC_HEADERS, HAVE_SYS_TYPES_H, etc. before using them. +dnl Without the checks they will fail to be included in test programs, +dnl which will subsequently fail. +AC_HEADER_STDC + +dnl Check for large file support. This check needs to come fairly +dnl early because it could (in principle) affect whether functions and +dnl headers are available, whether they work, etc. +AC_SYS_LARGEFILE +AC_CHECK_SIZEOF(off_t) dnl -dnl Checks for headers +dnl Checks for system header files that might be missing. dnl -AC_CHECK_HEADERS(string.h stdarg.h unistd.h sys/time.h utime.h sys/utime.h) -AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h sys/utsname.h) -AC_CHECK_HEADERS(inttypes.h signal.h setjmp.h pwd.h) -AC_HEADER_TIME +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) dnl -dnl Check integral type sizes. +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 *) dnl dnl Checks for non-universal or system-specific types. dnl AC_TYPE_SIZE_T AC_TYPE_PID_T -AC_CHECK_TYPES(uint32_t) -AC_TYPE_SIGNAL +AC_CHECK_TYPES([uint32_t, uintptr_t, intptr_t, int64_t]) AC_CHECK_TYPES(sig_atomic_t, [], [], [ #include #include #if HAVE_INTTYPES_H # include #endif -#ifdef HAVE_SIGNAL_H -# include -#endif +#include ]) dnl @@ -201,24 +193,35 @@ dnl Checks for library functions. dnl AC_FUNC_ALLOCA AC_FUNC_MMAP -AC_CHECK_FUNCS(strdup strstr strcasecmp strncasecmp strpbrk memmove) -AC_CHECK_FUNCS(gettimeofday mktime strptime strerror snprintf vsnprintf) -AC_CHECK_FUNCS(usleep select sigblock sigsetjmp signal symlink access isatty) +AC_FUNC_FSEEKO +AC_CHECK_FUNCS(strptime timegm snprintf vsnprintf vasprintf drand48) +AC_CHECK_FUNCS(strtoll usleep ftello sigblock sigsetjmp memrchr) + +dnl We expect to have these functions on Unix-like systems configure +dnl runs on. The defines are provided to get them in config.h.in so +dnl Wget can still be ported to non-Unix systems (such as Windows) +dnl that lack some of these functions. +AC_DEFINE([HAVE_STRCASECMP], 1, [Define to 1 if you have the `strcasecmp' function.]) +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's local macros defined in aclocal. +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 dnl Check if we need to compile in getopt.c. dnl AC_CHECK_FUNC(getopt_long, [], [ - GETOPT_OBJ='getopt$o' + GETOPT_OBJ='getopt.o' ]) AC_SUBST(GETOPT_OBJ) @@ -226,186 +229,75 @@ dnl dnl Checks for libraries. dnl -dnl #### This appears to be deficient with later versions of SOCKS. -if test "x${with_socks}" = xyes -then - AC_CHECK_LIB(resolv, main) - AC_CHECK_LIB(socks, Rconnect) -fi - -dnl $with_ssl can be one of: -dnl - empty string or "auto", meaning autodetect SSL and use it if found. -dnl - "yes", meaning link with SSL or bail out. -dnl - "no", meaning don't link with SSL. -dnl - anything else, meaning use that as the SSL root, and bail out -dnl if it fails. - -if test x"$with_ssl" = x; then - dnl Canonicalize unspecified with-ssl setting to "auto". This - dnl implements the "auto-detect by default" feature. If you want to - dnl change this to "ignore SSL by default", change "auto" to "no". - with_ssl=auto -fi - -dnl Detection of OpenSSL is much hairier than the detection of other -dnl libraries because OpenSSL can be compiled as a third-party -dnl library, which means it will not be found without additional -dnl linker magic. It would be really nice to rework this check into -dnl an AC_DEFUN so that we can reuse it for other third-party -dnl libraries. - -if test x"$with_ssl" != x"no"; then - - wget_force_ssl=no - if test x"$with_ssl" = x"yes"; then - wget_force_ssl=yes - fi - - if test x"$with_ssl" = x"yes" || test x"$with_ssl" = x"auto"; then - dnl OpenSSL's root was not specified, so we have to guess. First - dnl try the system default location, then "/usr/local/ssl" (where - dnl OpenSSL installs by default), then "/usr/local" (traditional - dnl choice for installation root), then "/opt". - ssl_all_roots="system-default /usr/local/ssl /usr/local /opt" +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]) + SSL_OBJ='gnutls.o' else - dnl Root has been specified by the user. - ssl_all_roots=$with_ssl - wget_force_ssl=yes + 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) + ]) - wget_save_CC=$CC - wget_save_LIBS=$LIBS - wget_save_LDFLAGS=$LDFLAGS - wget_save_CPPFLAGS=$CPPFLAGS - - dnl Use libtool for OpenSSL tests so we can specify "-R" - dnl without having to know how the linker handles it. - CC="$SHELL ./libtool $CC" - - dnl Unfortunately, as of this writing (OpenSSL 0.9.6), the libcrypto - dnl shared library doesn't record its dependency on libdl, so we - dnl need to check for it ourselves so we won't fail to link due to a - dnl lack of -ldl. Most OSes use dlopen(), but HP-UX uses - dnl shl_load(). - AC_CHECK_LIB(dl,dlopen) - AC_CHECK_LIB(dl,shl_load) - - ssl_success=no - - dnl Now try to find SSL libraries in each of the likely SSL roots. - for ssl_root in $ssl_all_roots - do - if test x"$ssl_root" = x"system-default"; then - dnl Try the default include and library locations. - SSL_INCLUDES= - else - dnl Try this specific root. - SSL_INCLUDES=-I$ssl_root/include - dnl It's OK to use -R directly because libtool will - dnl interpret it for us. - LDFLAGS="-L$ssl_root/lib -R$ssl_root/lib $wget_save_LDFLAGS" - fi - - AC_MSG_NOTICE([looking for SSL libraries in $ssl_root]) - - dnl Check whether the compiler can find the include files. On - dnl some systems Gcc finds libraries in /usr/local/lib, but fails - dnl to find the includes in /usr/local/include. - - ssl_found_includes=no - CPPFLAGS="$SSL_INCLUDES $wget_save_CPPFLAGS" - - AC_MSG_CHECKING([for includes]) - - AC_TRY_CPP([#include -#include -], - AC_MSG_RESULT(found); ssl_found_includes=yes, - AC_MSG_RESULT([not found]) - ) - - if test x"$ssl_found_includes" = xno; then - continue - fi - - ssl_link_failure=no - - dnl Make sure that the checks don't run afoul of the cache. It - dnl would be nicer to temporarily turn off the cache, but - dnl apparently Autoconf doesn't allow that. - - unset ac_cv_lib_crypto_RSA_new - unset ac_cv_lib_ssl_SSL_new - - dnl These checks need to be in this order, or you'll get a link - dnl failure if you use a static libcrypto.a and libssl.a rather - dnl than shared libraries. - - AC_CHECK_LIB(crypto, RSA_new, , ssl_link_failure=yes) - AC_CHECK_LIB(ssl, SSL_new, , ssl_link_failure=yes) - - if test x"$ssl_link_failure" = xyes; then - dnl One or both libs failed to link. - continue + dnl Now actually check for -lssl + AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [ + #include + #include + #include + #include + #include + #include + #include + ], [SSL_library_init ()]) + if test x"$LIBSSL" != x + then + AC_MSG_NOTICE([compiling in support for SSL via OpenSSL]) + SSL_OBJ='openssl.o' + elif test x"$with_ssl" != x + then + AC_MSG_ERROR([--with-ssl was given, but SSL is not available.]) fi + ]) # endif: --with-ssl == no? +]) # endif: --with-ssl == gnutls? - dnl The libraries link. But we still need to check if the program - dnl linked with those libraries under these settings with run. On - dnl some systems (Solaris), Gcc adds -L/usr/local/lib to the - dnl linking line, but fails to add -R/usr/local/lib, thus creating - dnl executables that link, but fail to run. - - dnl If we are cross-compiling, just assume that working linkage - dnl implies working executable. - - ssl_run_failure=no - - AC_MSG_CHECKING([whether SSL libs are resolved at runtime]) - AC_TRY_RUN([ -int RSA_new(); -int SSL_new(); -main(){return 0;} -], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no); ssl_run_failure=yes, - AC_MSG_RESULT(cross) - ) - - if test x"$ssl_run_failure" = xno; then - ssl_success=yes - break - fi - done - - if test x"$ssl_success" = xyes; then - AC_MSG_NOTICE([compiling in support for SSL in $ssl_root]) - AC_DEFINE([HAVE_SSL], [], - [Define if SSL support should be compiled in.]) - AC_SUBST(SSL_INCLUDES) - SSL_OBJ='gen_sslfunc$o' - AC_SUBST(SSL_OBJ) - else - LDFLAGS=$wget_save_LDFLAGS - LIBS=$wget_save_LIBS +AC_SUBST(SSL_OBJ) - dnl If linking with SSL was forced rather than auto-detected, then - dnl bail out if SSL failed. - if test x"$wget_force_ssl" = x"yes"; then - AC_MSG_ERROR([failed to find OpenSSL libraries], 2) - fi +dnl Enable NTLM if requested and if SSL is available. +NTLM_OBJ='' +if test x"$LIBSSL" != x +then + if test x"$ENABLE_NTLM" != xno + then + AC_DEFINE([ENABLE_NTLM], 1, + [Define if you want the NTLM authorization support compiled in.]) + NTLM_OBJ='http-ntlm.o' + 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 - - dnl Restore the compiler setting. - CC=$wget_save_CC - - dnl Restore the CPPFLAGS. Do this regardless of whether linking - dnl with SSL succeeded -- SSL includes will be handled using - dnl @SSL_INCLUDES@. - CPPFLAGS=$wget_save_CPPFLAGS fi +AC_SUBST(NTLM_OBJ) dnl -dnl Find an md5 implementation. +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 @@ -413,22 +305,23 @@ then dnl This should be moved to an AC_DEFUN, but I'm not sure how to dnl manipulate MD5_OBJ from the defun. - MD5_OBJ='gen-md5$o' + MD5_OBJ='gen-md5.o' 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. md5_calc is, hopefully, - dnl specific to the Solaris MD5 library. + 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([whether md5.h can be included]) + AC_MSG_CHECKING([for working md5.h]) AC_COMPILE_IFELSE([#include ], [ AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_SOLARIS_MD5], [], [Define to use Solaris MD5.]) + 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]) @@ -439,8 +332,8 @@ then 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"$ssl_success" = xyes; then - AC_DEFINE([HAVE_OPENSSL_MD5], [], [Define to use OpenSSL MD5.]) + 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]) fi @@ -448,13 +341,14 @@ then 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], [], [Define to use built-in MD5.]) - MD5_OBJ="$MD5_OBJ gnu-md5\$o" + AC_DEFINE([HAVE_BUILTIN_MD5], 1, [Define when using built-in MD5.]) + MD5_OBJ="$MD5_OBJ gnu-md5.o" found_md5=yes - AC_MSG_NOTICE([using the GNU MD5 implementation]) + AC_MSG_NOTICE([using the built-in (GNU) MD5 implementation]) + AC_C_BIGENDIAN fi fi -AC_DEFINE([HAVE_MD5], [], [Define if we're compiling support for MD5.]) +AC_DEFINE([HAVE_MD5], 1, [Define if we're compiling support for MD5.]) AC_SUBST(MD5_OBJ) dnl ********************************************************************** @@ -462,109 +356,105 @@ dnl Checks for IPv6 dnl ********************************************************************** dnl -dnl If --enable-ipv6 is specified, we try to use IPv6 (as long as -dnl getaddrinfo is also present). If --disable-ipv6 is specified, we -dnl don't use IPv6 or getaddrinfo. +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 +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 +dnl is specified, we disable IPv6 and don't check for it. The default +dnl is to autodetect IPv6 and use it where available. dnl -ipv6= -check_for_ipv6=no AC_ARG_ENABLE(ipv6, AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]), [case "${enable_ipv6}" in - no) - AC_MSG_NOTICE([disabling IPv6 at user request]) - ipv6=no - ;; - *) + no) + AC_MSG_NOTICE([disabling IPv6 at user request]) + dnl Disable IPv6 checking + ipv6=no + ;; + yes) + dnl IPv6 explicitly enabled: force its use (abort if unavailable). + ipv6=yes + force_ipv6=yes + ;; + auto) + dnl Auto-detect IPv6, i.e. check for IPv6, but don't force it. + ipv6=yes + ;; + *) + AC_MSG_ERROR([Invalid --enable-ipv6 argument \`$enable_ipv6']) + ;; + esac + ], [ + dnl If nothing is specified, assume auto-detection. ipv6=yes - ;; - esac], - dnl If unspecified, check for IPv6 and use it where available. - [check_for_ipv6=yes] + ] ) -if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then - AC_CHECK_FUNCS(getaddrinfo,[ - GETADDRINFO_AI_ADDRCONFIG( - AC_DEFINE( - [HAVE_GETADDRINFO_AI_ADDRCONFIG], 1, - [Define if the system headers support the AI_ADDRCONFIG flag.] - ) - ) - GETADDRINFO_AI_V4MAPPED( - AC_DEFINE( - [HAVE_GETADDRINFO_AI_V4MAPPED], 1, - [Define if the system headers support the AI_V4MAPPED flag.] - ) - ) - GETADDRINFO_AI_ALL( - AC_DEFINE( - [HAVE_GETADDRINFO_AI_ALL], 1, - [Define if the system headers support the AI_ALL flag.] - ) - ) - ],[ +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" || test "X$check_for_ipv6" = "Xyes"; then - PROTO_INET6(,[ +if test "X$ipv6" = "Xyes"; then + PROTO_INET6([], [ AC_MSG_NOTICE([Disabling IPv6 support: your system does not support the PF_INET6 protocol family]) ipv6=no ]) fi -if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then - TYPE_STRUCT_SOCKADDR_IN6([ - ipv6=yes - ],[ - AC_MSG_NOTICE([Disabling IPv6 support: your system does not support 'struct sockaddr_in6']) +if test "X$ipv6" = "Xyes"; then + TYPE_STRUCT_SOCKADDR_IN6([],[ + AC_MSG_NOTICE([Disabling IPv6 support: your system does not support \`struct sockaddr_in6']) ipv6=no ]) if test "X$ipv6" = "Xyes"; then + WGET_STRUCT_SOCKADDR_STORAGE MEMBER_SIN6_SCOPE_ID fi fi if test "X$ipv6" = "Xyes"; then AC_DEFINE([ENABLE_IPV6], 1, [Define if IPv6 support is enabled.]) + AC_MSG_NOTICE([Enabling support for IPv6.]) +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 -ALL_LINGUAS=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')` - 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=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')` dnl internationalization macros WGET_WITH_NLS dnl -dnl Find makeinfo. If makeinfo is not found, look for Emacs. If -dnl Emacs cannot be found, look for XEmacs. +dnl Find makeinfo. We used to provide support for Emacs processing +dnl Texinfo using `emacs -batch -eval ...' where makeinfo is +dnl unavailable, but that broke with the addition of makeinfo-specific +dnl command-line options, such as `-I'. Now we depend on makeinfo to +dnl build the Info documentation. dnl -AC_CHECK_PROGS(MAKEINFO, makeinfo emacs xemacs) - -case "${MAKEINFO}" in - *makeinfo) MAKEINFO="${MAKEINFO} \$(srcdir)/wget.texi" ;; - *emacs | *xemacs) MAKEINFO="${MAKEINFO} -batch -q -no-site-file -eval '(find-file \"\$(srcdir)/wget.texi\")' -l texinfmt -f texinfo-format-buffer -f save-buffer" ;; - *) MAKEINFO="makeinfo \$(srcdir)/wget.texi" ;; -esac +AC_CHECK_PROGS(MAKEINFO, [makeinfo], [true]) dnl dnl Find perl and pod2man dnl -AC_PATH_PROGS(PERL, perl5 perl, no) +AC_PATH_PROGS(PERL, [perl5 perl], no) AC_PATH_PROG(POD2MAN, pod2man, no) if test "x${POD2MAN}" = xno; then @@ -577,7 +467,13 @@ AC_SUBST(COMMENT_IF_NO_POD2MAN) dnl dnl Create output dnl -AC_OUTPUT([Makefile src/Makefile doc/Makefile util/Makefile po/Makefile.in - windows/Makefile], -[WGET_PROCESS_PO -test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h]) +AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile + po/Makefile.in tests/Makefile tests/WgetTest.pm + windows/Makefile]) +AC_CONFIG_HEADERS([src/config.h]) +AH_BOTTOM([ +#include "config-post.h" +]) +AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) +AC_CONFIG_COMMANDS([default], [WGET_PROCESS_PO]) +AC_OUTPUT