[svn] Fix treminology mismatch: tag->revision

[wget] / configure.in

diff --git a/configure.in b/configure.in
index c1ee708bb6febc920b8ea8186006a3f4e9b162d7..61065ca73bdc95404a9bcc5a092ae5284dd1110f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -85,7 +85,7 @@ case "${ENABLE_OPIE}${ENABLE_DIGEST}" in
        wget_need_md5=yes
 esac
 if test x"$ENABLE_OPIE" = xyes; then
-  OPIE_OBJ='ftp-opie$o'
+  OPIE_OBJ='ftp-opie.o'
 fi
 AC_SUBST(OPIE_OBJ)
 
@@ -109,7 +109,6 @@ test -z "$CC" && cc_specified=yes
 
 AC_PROG_CC
 AC_AIX
-AM_PROG_CC_STDC
 
 dnl Turn on optimization by default.  Specifically:
 dnl
@@ -152,34 +151,31 @@ dnl
 AC_C_CONST
 AC_C_INLINE
 AC_C_VOLATILE
+dnl Needed for GNU md5 code.
 AC_C_BIGENDIAN
-AC_C_PROTOTYPES
-
-if test x"$am_cv_prog_cc_stdc" != xno; then :
-  AC_SUBST(U, [])
-  AC_SUBST(ANSI2KNR, [])
-else
-  AC_SUBST(U, [_])
-  AC_SUBST(ANSI2KNR, [./ansi2knr])
-fi
 
 dnl
 dnl Checks for header files that might be missing.
 dnl
 
 dnl Check for basic headers, even those we assume the presence of.
-dnl This is because Autoconf default includes check for STDC_HEADERS,
-dnl HAVE_SYS_TYPES_H, etc. before including them.
+dnl This is because test programs used by Autoconf macros check for
+dnl STDC_HEADERS, HAVE_SYS_TYPES_H, etc. before including them.
+dnl Without these checks they will fail to be included in test
+dnl programs, which will subsequently fail.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(sys/types.h sys/stat.h)
-dnl Now check for the others.
-AC_CHECK_HEADERS(string.h strings.h stdarg.h limits.h unistd.h sys/time.h)
+
+dnl Now the real checks:
+AC_HEADER_STDBOOL
+AC_CHECK_HEADERS(string.h strings.h limits.h 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 signal.h setjmp.h pwd.h)
-AC_HEADER_TIME
+AC_CHECK_HEADERS(stdint.h inttypes.h setjmp.h pwd.h)
 
 dnl
-dnl Check integral type sizes.
+dnl Check sizes of signed 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)
@@ -200,16 +196,13 @@ dnl
 AC_TYPE_SIZE_T
 AC_TYPE_PID_T
 AC_CHECK_TYPES(uint32_t)
-AC_TYPE_SIGNAL
 AC_CHECK_TYPES(sig_atomic_t, [], [], [
 #include <stdio.h>
 #include <sys/types.h>
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
+#include <signal.h>
 ])
 
 dnl
@@ -218,13 +211,13 @@ dnl
 AC_FUNC_ALLOCA
 AC_FUNC_MMAP
 AC_FUNC_FSEEKO
-AC_CHECK_FUNCS(strdup strstr strcasecmp strncasecmp strpbrk memmove)
-AC_CHECK_FUNCS(gettimeofday mktime strptime strerror snprintf vsnprintf)
-AC_CHECK_FUNCS(usleep select ftello sigblock sigsetjmp signal)
-AC_CHECK_FUNCS(symlink access isatty)
+AC_CHECK_FUNCS(strdup strcasecmp strncasecmp strpbrk)
+AC_CHECK_FUNCS(mktime strptime snprintf vsnprintf)
+AC_CHECK_FUNCS(usleep ftello sigblock sigsetjmp)
+AC_CHECK_FUNCS(symlink isatty)
 
 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
@@ -237,7 +230,7 @@ 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)
 
@@ -333,14 +326,12 @@ if test x"$with_ssl" != x"no"; then
     AC_MSG_CHECKING([for includes])
     AC_COMPILE_IFELSE([
 #include <openssl/ssl.h>
-#include <openssl/bio.h>
-#include <openssl/crypto.h>
-#include <openssl/des.h>
+#include <openssl/x509.h>
 #include <openssl/err.h>
-#include <openssl/md4.h>
-#include <openssl/pem.h>
 #include <openssl/rand.h>
-#include <openssl/x509.h>
+#include <openssl/des.h>
+#include <openssl/md4.h>
+#include <openssl/md5.h>
     ], [
       AC_MSG_RESULT(found)
       ssl_found_includes=yes
@@ -406,7 +397,7 @@ main(){return 0;}
     AC_DEFINE([HAVE_SSL], 1,
               [Define if SSL support should be compiled in.])
     AC_SUBST(SSL_INCLUDES)
-    SSL_OBJ='openssl$o'
+    SSL_OBJ='openssl.o'
     AC_SUBST(SSL_OBJ)
   else
     LDFLAGS=$wget_save_LDFLAGS
@@ -436,7 +427,7 @@ then
   then
     AC_DEFINE([ENABLE_NTLM], 1,
      [Define if you want the NTLM authorization support compiled in.])
-    NTLM_OBJ='http-ntlm$o'
+    NTLM_OBJ='http-ntlm.o'
   fi
 else
   dnl If SSL is unavailable and the user explicitly requested NTLM,
@@ -457,7 +448,7 @@ 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
@@ -493,7 +484,7 @@ 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.])
-    MD5_OBJ="$MD5_OBJ gnu-md5\$o"
+    MD5_OBJ="$MD5_OBJ gnu-md5.o"
     found_md5=yes
     AC_MSG_NOTICE([using the GNU MD5 implementation])
   fi