[svn] Improved support for unit testing

[wget] / configure.in

diff --git a/configure.in b/configure.in
index ba3d28dad1a1d3a0817e9e0a699277840abff490..e012e52dfc181ffdffd8c9943ce0e95aa2c3abb0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -124,7 +124,7 @@ dnl   else
 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"                      ;;
@@ -171,7 +171,7 @@ 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_CHECK_HEADERS(stdint.h inttypes.h setjmp.h pwd.h)
+AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h)
 
 dnl
 dnl Check sizes of integer types.  These are used to find n-bit
@@ -204,8 +204,8 @@ dnl
 AC_FUNC_ALLOCA
 AC_FUNC_MMAP
 AC_FUNC_FSEEKO
-AC_CHECK_FUNCS(strptime timegm snprintf vsnprintf drand48)
-AC_CHECK_FUNCS(usleep ftello sigblock sigsetjmp symlink)
+AC_CHECK_FUNCS(strptime timegm snprintf vsnprintf vasprintf drand48)
+AC_CHECK_FUNCS(strtoll strtoimax usleep ftello sigblock sigsetjmp)
 
 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 +248,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 +274,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 +476,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"