diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 285 |
1 files changed, 273 insertions, 12 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wget 1.17.1. +# Generated by GNU Autoconf 2.69 for wget 1.18. # # Report bugs to <bug-wget@gnu.org>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wget' PACKAGE_TARNAME='wget' -PACKAGE_VERSION='1.17.1' -PACKAGE_STRING='wget 1.17.1' +PACKAGE_VERSION='1.18' +PACKAGE_STRING='wget 1.18' PACKAGE_BUGREPORT='bug-wget@gnu.org' PACKAGE_URL='' @@ -645,6 +645,8 @@ WITH_SSL_FALSE WITH_SSL_TRUE IRI_IS_ENABLED_FALSE IRI_IS_ENABLED_TRUE +CARES_LIBS +CARES_CFLAGS PCRE_LIBS PCRE_CFLAGS UUID_LIBS @@ -1672,6 +1674,7 @@ with_libpsl with_ssl with_zlib with_metalink +with_cares enable_opie enable_digest enable_ntlm @@ -1724,7 +1727,9 @@ METALINK_LIBS UUID_CFLAGS UUID_LIBS PCRE_CFLAGS -PCRE_LIBS' +PCRE_LIBS +CARES_CFLAGS +CARES_LIBS' # Initialize some variables set by options. @@ -2265,7 +2270,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wget 1.17.1 to adapt to many kinds of systems. +\`configure' configures wget 1.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2335,7 +2340,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wget 1.17.1:";; + short | recursive ) echo "Configuration of wget 1.18:";; esac cat <<\_ACEOF @@ -2373,6 +2378,7 @@ Optional Packages: specify SSL backend. GNU TLS is the default. --without-zlib disable zlib. --with-metalink enable support for metalinks. + --with-cares enable support for C-Ares DNS lookup. --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir @@ -2431,6 +2437,9 @@ Some influential environment variables: UUID_LIBS linker flags for UUID, overriding pkg-config PCRE_CFLAGS C compiler flags for PCRE, overriding pkg-config PCRE_LIBS linker flags for PCRE, overriding pkg-config + CARES_CFLAGS + C compiler flags for CARES, overriding pkg-config + CARES_LIBS linker flags for CARES, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2498,7 +2507,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wget configure 1.17.1 +wget configure 1.18 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3207,7 +3216,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wget $as_me 1.17.1, which was +It was created by wget $as_me 1.18, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4161,7 +4170,7 @@ fi # Define the identity of the package. PACKAGE='wget' - VERSION='1.17.1' + VERSION='1.18' cat >>confdefs.h <<_ACEOF @@ -4332,6 +4341,45 @@ cat >>confdefs.h <<_ACEOF _ACEOF +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + @@ -4349,7 +4397,6 @@ fi - # Check whether --with-zlib was given. if test "${with_zlib+set}" = set; then : withval=$with_zlib; @@ -4364,6 +4411,15 @@ fi +# Check whether --with-cares was given. +if test "${with_cares+set}" = set; then : + withval=$with_cares; with_cares=$withval +else + with_cares=no +fi + + + # Check whether --enable-opie was given. if test "${enable_opie+set}" = set; then : enableval=$enable_opie; ENABLE_OPIE=$enableval @@ -40322,6 +40378,209 @@ fi fi +if test "X$with_cares" == "Xyes"; then : + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CARES" >&5 +$as_echo_n "checking for CARES... " >&6; } + +if test -n "$CARES_CFLAGS"; then + pkg_cv_CARES_CFLAGS="$CARES_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libcares") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CARES_CFLAGS=`$PKG_CONFIG --cflags "libcares" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$CARES_LIBS"; then + pkg_cv_CARES_LIBS="$CARES_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libcares") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CARES_LIBS=`$PKG_CONFIG --libs "libcares" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + CARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcares" 2>&1` + else + CARES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcares" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$CARES_PKG_ERRORS" >&5 + + + ac_fn_c_check_header_mongrel "$LINENO" "ares.h" "ac_cv_header_ares_h" "$ac_includes_default" +if test "x$ac_cv_header_ares_h" = xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ares_set_local_ip4 in -lcares" >&5 +$as_echo_n "checking for ares_set_local_ip4 in -lcares... " >&6; } +if ${ac_cv_lib_cares_ares_set_local_ip4+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcares $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ares_set_local_ip4 (); +int +main () +{ +return ares_set_local_ip4 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cares_ares_set_local_ip4=yes +else + ac_cv_lib_cares_ares_set_local_ip4=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cares_ares_set_local_ip4" >&5 +$as_echo "$ac_cv_lib_cares_ares_set_local_ip4" >&6; } +if test "x$ac_cv_lib_cares_ares_set_local_ip4" = xyes; then : + + LIBS="-lcares ${LIBS}" + +$as_echo "#define HAVE_LIBCARES 1" >>confdefs.h + + RESOLVER_INFO="libcares, --bind-dns-address and --dns-servers available" + +fi + + +fi + + + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + ac_fn_c_check_header_mongrel "$LINENO" "ares.h" "ac_cv_header_ares_h" "$ac_includes_default" +if test "x$ac_cv_header_ares_h" = xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ares_set_local_ip4 in -lcares" >&5 +$as_echo_n "checking for ares_set_local_ip4 in -lcares... " >&6; } +if ${ac_cv_lib_cares_ares_set_local_ip4+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcares $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ares_set_local_ip4 (); +int +main () +{ +return ares_set_local_ip4 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cares_ares_set_local_ip4=yes +else + ac_cv_lib_cares_ares_set_local_ip4=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cares_ares_set_local_ip4" >&5 +$as_echo "$ac_cv_lib_cares_ares_set_local_ip4" >&6; } +if test "x$ac_cv_lib_cares_ares_set_local_ip4" = xyes; then : + + LIBS="-lcares ${LIBS}" + +$as_echo "#define HAVE_LIBCARES 1" >>confdefs.h + + RESOLVER_INFO="libcares, --bind-dns-address and --dns-servers available" + +fi + + +fi + + + +else + CARES_CFLAGS=$pkg_cv_CARES_CFLAGS + CARES_LIBS=$pkg_cv_CARES_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + CFLAGS="$CARES_CFLAGS $CFLAGS" + ac_fn_c_check_header_mongrel "$LINENO" "ares.h" "ac_cv_header_ares_h" "$ac_includes_default" +if test "x$ac_cv_header_ares_h" = xyes; then : + + LIBS="$CARES_LIBS $LIBS" + +$as_echo "#define HAVE_LIBCARES 1" >>confdefs.h + + RESOLVER_INFO="libcares, --bind-dns-address and --dns-servers available" + +fi + + + +fi + +else + + RESOLVER_INFO="libc, --bind-dns-address and --dns-servers not available" + +fi + + if test "X$iri" != "Xno"; then IRI_IS_ENABLED_TRUE= IRI_IS_ENABLED_FALSE='#' @@ -40989,7 +41248,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wget $as_me 1.17.1, which was +This file was extended by wget $as_me 1.18, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -41059,7 +41318,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wget config.status 1.17.1 +wget config.status 1.18 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -42100,6 +42359,7 @@ fi Assertions: $ENABLE_ASSERTION Valgrind: $VALGRIND_INFO Metalink: $with_metalink + Resolver: $RESOLVER_INFO GPGME: $have_gpg " >&5 $as_echo "$as_me: Summary of build options: @@ -42121,5 +42381,6 @@ $as_echo "$as_me: Summary of build options: Assertions: $ENABLE_ASSERTION Valgrind: $VALGRIND_INFO Metalink: $with_metalink + Resolver: $RESOLVER_INFO GPGME: $have_gpg " >&6;} |