dnl
AC_INIT([src/version.c])
-AC_PREREQ(2.57)
+AC_PREREQ(2.59)
dnl Include the M4 macros we use.
builtin(include, [m4/wget.m4])dnl
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" ;;
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
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, intptr_t, int64_t])
AC_CHECK_TYPES(sig_atomic_t, [], [], [
#include <stdio.h>
#include <sys/types.h>
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 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 Checks for libraries.
dnl
-dnl Check for OpenSSL
-if test x"$with_ssl" != x"no"
+if test x"$with_ssl" = xgnutls
then
+ 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
+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)
])
], [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 is being compiled in.])
+ 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
fi
+
AC_SUBST(SSL_OBJ)
dnl Enable NTLM if requested and if SSL is available.
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])
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
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
- AC_MSG_NOTICE([using the GNU MD5 implementation])
+ AC_MSG_NOTICE([using the built-in (GNU) MD5 implementation])
AC_C_BIGENDIAN
fi
fi
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"