[svn] Parse Content-Disposition better. Implement memrchr where missing.

[wget] / configure.in

diff --git a/configure.in b/configure.in
index 2a6f4163a9b1d577288a1c86d4a2d383adecace7..436efc9958431581242faa9a68334d07215849e8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -182,13 +182,14 @@ 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_CHECK_TYPES([uint32_t, uintptr_t])
 AC_CHECK_TYPES(sig_atomic_t, [], [], [
 #include <stdio.h>
 #include <sys/types.h>
@@ -205,7 +206,7 @@ AC_FUNC_ALLOCA
 AC_FUNC_MMAP
 AC_FUNC_FSEEKO
 AC_CHECK_FUNCS(strptime timegm snprintf vsnprintf vasprintf drand48)
-AC_CHECK_FUNCS(strtoll strtoimax usleep ftello sigblock sigsetjmp)
+AC_CHECK_FUNCS(strtoll strtoimax 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
@@ -248,15 +249,15 @@ then
   if test x"$LIBGNUTLS" != x
   then
     AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
-    AC_DEFINE([HAVE_GNUTLS], 1,
-             [Define if support for the GnuTLS library is being compiled in.])
     SSL_OBJ='gnutls.o'
+  else
+    AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
   fi
-else
+elif test x"$with_ssl" != xno; then
   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().
+  dnl dlopen(), but HP-UX uses shl_load().
   AC_CHECK_LIB(dl, dlopen, [], [
     AC_CHECK_LIB(dl, shl_load)
   ])
@@ -274,9 +275,10 @@ else
   if test x"$LIBSSL" != x
   then
     AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-    AC_DEFINE([HAVE_OPENSSL], 1,
-             [Define if support for the OpenSSL library is being compiled in.])
     SSL_OBJ='openssl.o'
+  elif test x"$with_ssl" != x
+  then
+    AC_MSG_ERROR([--with-ssl was given, but SSL is not available.])
   fi
 fi
 
@@ -475,7 +477,7 @@ dnl
 dnl Create output
 dnl
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile
-                 po/Makefile.in windows/Makefile])
+                 po/Makefile.in tests/Makefile windows/Makefile])
 AC_CONFIG_HEADERS([src/config.h])
 AH_BOTTOM([
 #include "config-post.h"