[svn] Don't declare long-gone function "pwd_cuserid".

[wget] / configure.in

diff --git a/configure.in b/configure.in
index a2d30ca88fd9fd5a1d251bddef9ac2744386901a..dd155ec0d93c23d4994df6bd169c19d45716688b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -71,8 +71,8 @@ test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST)
 
 AC_ARG_ENABLE(debug,
 [  --disable-debug         disable support for debugging output],
-DEBUG=$enableval, DEBUG=yes)
-test x"${DEBUG}" = xyes && AC_DEFINE(DEBUG)
+ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes)
+test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG)
 
 wget_need_md5=no
 
@@ -157,9 +157,15 @@ AC_TYPE_SIZE_T
 AC_TYPE_PID_T
 AC_C_BIGENDIAN
 
-# Check size of long.
+dnl
+dnl Check integral type sizes.
+dnl
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
+AC_CHECK_HEADERS(inttypes.h)
+AC_CHECK_TYPES(uint32_t)
 
 dnl
 dnl Checks for headers
@@ -175,8 +181,10 @@ dnl
 AC_TYPE_SIGNAL
 
 dnl
-dnl Check for struct utimbuf
+dnl Call several of Wget's macros.
+dnl
 WGET_STRUCT_UTIMBUF
+WGET_SOCKLEN_T
 
 dnl
 dnl Checks for library functions.
@@ -448,9 +456,7 @@ 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.  If neither are specified, we test
-dnl whether it's possible to create an AF_INET6 socket and if yes, use
-dnl IPv6.
+dnl don't use IPv6 or getaddrinfo.
 dnl
 
 ipv6=
@@ -466,10 +472,11 @@ AC_ARG_ENABLE(ipv6,
     ipv6=yes
     ;;
   esac],
+  dnl If unspecified, check for IPv6 and use it where available.
   [check_for_ipv6=yes]
 )
 
-if test "X$ipv6" = "Xyes" -o "X$check_for_ipv6" = "Xyes"; then
+if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
   AC_CHECK_FUNCS(getaddrinfo,[
     GETADDRINFO_AI_ADDRCONFIG(
       AC_DEFINE(
@@ -494,15 +501,15 @@ if test "X$ipv6" = "Xyes" -o "X$check_for_ipv6" = "Xyes"; then
     ipv6=no
   ])
 fi
-  
-if test "X$ipv6" = "Xyes" -o "X$check_for_ipv6" = "Xyes"; then
+
+if test "X$ipv6" = "Xyes" || test "X$check_for_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" -o "X$check_for_ipv6" = "Xyes"; then
+if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
   TYPE_STRUCT_SOCKADDR_IN6([
     ipv6=yes
   ],[