Merge with mainline

[wget] / configure.in

diff --git a/configure.in b/configure.in
index a815aadb5297d190e6ee919ee62593bf76be3148..1e8fadfef66499cd096e1e0f3fd4d2b414f3a303 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl Template file for GNU Autoconf
 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 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,
 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 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 <http://www.gnu.org/licenses/>.

 
 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
 
 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


@@ -30,7 +29,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 
 AC_INIT([src/version.c])
 dnl
 
 AC_INIT([src/version.c])

-AC_PREREQ(2.57)
+AC_PREREQ(2.61)

 
 dnl Include the M4 macros we use.
 builtin(include, [m4/wget.m4])dnl
 
 dnl Include the M4 macros we use.
 builtin(include, [m4/wget.m4])dnl


@@ -59,8 +58,7 @@ dnl Process features.
 dnl
 
 AC_ARG_WITH(ssl,
 dnl
 
 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],
 
 AC_ARG_ENABLE(opie,
 [  --disable-opie          disable support for opie or s/key FTP login],


@@ -125,7 +123,7 @@ dnl   else
 dnl     use os-specific flags or -O
 if test -n "$auto_cflags"; then
   if test -n "$GCC"; then
 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"                      ;;
   else
     case "$host_os" in
       *hpux*)  CFLAGS="$CFLAGS +O3"                      ;;


@@ -135,44 +133,37 @@ if test -n "$auto_cflags"; then
   fi
 fi
 
   fi
 fi
 

-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 Checks for basic compiler characteristics.
 dnl
 AC_C_CONST
 AC_C_INLINE
 AC_C_VOLATILE
 dnl
 dnl Checks for basic compiler characteristics.
 dnl
 AC_C_CONST
 AC_C_INLINE
 AC_C_VOLATILE

-dnl Needed for GNU md5 code.
-AC_C_BIGENDIAN
-
-dnl
-dnl Checks for header files that might be missing.
-dnl

 
 

-dnl Check for basic headers, even though we expect their presence to
-dnl compile.  This is because test programs used by Autoconf macros
-dnl check for STDC_HEADERS, HAVE_SYS_TYPES_H, etc. before including
-dnl them.  Without these checks they will fail to be included in test
-dnl programs, which will subsequently fail.
+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
 
 AC_HEADER_STDC
 

-dnl Now the real checks:
+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 system header files that might be missing.
+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_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 setjmp.h pwd.h)
+AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h)

 
 dnl
 
 dnl

-dnl Check sizes of signed integer types.  These are used to find n-bit
+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
 dnl integral types on older systems that fail to provide intN_t and
 dnl uintN_t typedefs.
 dnl


@@ -180,21 +171,14 @@ AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)

-
-dnl
-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.
-dnl
-AC_SYS_LARGEFILE
-AC_CHECK_SIZEOF(off_t)
+AC_CHECK_SIZEOF(void *)

 
 dnl
 dnl Checks for non-universal or system-specific types.
 dnl
 AC_TYPE_SIZE_T
 AC_TYPE_PID_T
 
 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_CHECK_TYPES([uint32_t, uintptr_t, intptr_t, int64_t])

 AC_CHECK_TYPES(sig_atomic_t, [], [], [
 #include <stdio.h>
 #include <sys/types.h>
 AC_CHECK_TYPES(sig_atomic_t, [], [], [
 #include <stdio.h>
 #include <sys/types.h>


@@ -210,8 +194,8 @@ dnl
 AC_FUNC_ALLOCA
 AC_FUNC_MMAP
 AC_FUNC_FSEEKO
 AC_FUNC_ALLOCA
 AC_FUNC_MMAP
 AC_FUNC_FSEEKO

-AC_CHECK_FUNCS(strptime snprintf vsnprintf)
-AC_CHECK_FUNCS(usleep ftello sigblock sigsetjmp symlink)
+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 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


@@ -245,33 +229,50 @@ dnl
 dnl Checks for libraries.
 dnl
 
 dnl Checks for libraries.
 dnl
 

-dnl Check for OpenSSL
+AS_IF([test x"$with_ssl" = xgnutls], [
+  dnl Now actually check for -lssl
+  AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
+#include <gnutls/gnutls.h>
+  ], [gnutls_global_init()])
+  if test x"$LIBGNUTLS" != x
+  then
+    AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
+    SSL_OBJ='gnutls.o'
+  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 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 dnl shl_load().
-AC_CHECK_LIB(dl, dlopen, [], [
-  AC_CHECK_LIB(dl, shl_load)
-])
+    dnl Now actually check for -lssl
+    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
+  #include <openssl/ssl.h>
+  #include <openssl/x509.h>
+  #include <openssl/err.h>
+  #include <openssl/rand.h>
+  #include <openssl/des.h>
+  #include <openssl/md4.h>
+  #include <openssl/md5.h>
+    ], [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 Now actually check for -lssl
-AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
-#include <openssl/ssl.h>
-#include <openssl/x509.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/des.h>
-#include <openssl/md4.h>
-#include <openssl/md5.h>
-], [SSL_library_init ()])
-if test x"$LIBSSL" != x
-then
-  AC_MSG_NOTICE([compiling in support for SSL])
-  AC_DEFINE([HAVE_SSL], 1,
-            [Define if SSL support should be compiled in.])
-  SSL_OBJ='openssl.o'
-fi

 AC_SUBST(SSL_OBJ)
 
 dnl Enable NTLM if requested and if SSL is available.
 AC_SUBST(SSL_OBJ)
 
 dnl Enable NTLM if requested and if SSL is available.


@@ -295,7 +296,8 @@ fi
 AC_SUBST(NTLM_OBJ)
 
 dnl
 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
 dnl
 
 if test x"$wget_need_md5" = xyes


@@ -308,8 +310,9 @@ then
 
   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 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 <md5.h> in the compiler's
   if test x"$found_md5" = xno; then
     AC_CHECK_LIB(md5, md5_calc, [
       dnl Some installations have bogus <md5.h> in the compiler's


@@ -318,7 +321,7 @@ then
       AC_COMPILE_IFELSE([#include <md5.h>
                         ], [
         AC_MSG_RESULT(yes)
       AC_COMPILE_IFELSE([#include <md5.h>
                         ], [
         AC_MSG_RESULT(yes)

-        AC_DEFINE([HAVE_SOLARIS_MD5], 1, [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])
         LIBS="-lmd5 $LIBS"
         found_md5=yes
         AC_MSG_NOTICE([using the Solaris MD5 implementation])


@@ -329,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
   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], 1, [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
       found_md5=yes
       AC_MSG_NOTICE([using the OpenSSL MD5 implementation])
     fi


@@ -338,10 +341,11 @@ then
 
   dnl If none of the above worked, use the one we ship with Wget.
   if test x"$found_md5" = xno; 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], 1, [Define to use built-in MD5.])
+    AC_DEFINE([HAVE_BUILTIN_MD5], 1, [Define when using built-in MD5.])

     MD5_OBJ="$MD5_OBJ gnu-md5.o"
     found_md5=yes
     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], 1, [Define if we're compiling support for MD5.])
   fi
 fi
 AC_DEFINE([HAVE_MD5], 1, [Define if we're compiling support for MD5.])


@@ -352,10 +356,15 @@ dnl Checks for IPv6
 dnl **********************************************************************
 
 dnl
 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.  Otherwise we detect IPv6 and use
-dnl it where available.
+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
 
 AC_ARG_ENABLE(ipv6,
 dnl
 
 AC_ARG_ENABLE(ipv6,


@@ -421,12 +430,12 @@ fi
 dnl
 dnl Set of available languages.
 dnl
 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 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 internationalization macros
 WGET_WITH_NLS


@@ -459,7 +468,8 @@ dnl
 dnl Create output
 dnl
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile
 dnl Create output
 dnl
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile

-                 po/Makefile.in windows/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_HEADERS([src/config.h])
 AH_BOTTOM([
 #include "config-post.h"