X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=configure.in;h=c87ad72ed3e419fa5814e2f2ce6eb1c3936fba8a;hb=5a78ac6dd9bda5ecd91619bb0783809f24c36d68;hp=1efe8c790a0cdd566cda67c3913e4482d93d1124;hpb=f86c13a950f9cfc9f29671fb686cd56b0f5f8136;p=wget
diff --git a/configure.in b/configure.in
index 1efe8c79..c87ad72e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
dnl Template file for GNU Autoconf
-dnl Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1995, 1996, 1997, 2001, 2007 Free Software Foundation, Inc.
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
+dnl the Free Software Foundation; either version 3 of the License, or
dnl (at your option) any later version.
dnl This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+dnl along with this program. If not, see .
dnl In addition, as a special exception, the Free Software Foundation
dnl gives permission to link the code of its release of Wget with the
@@ -29,23 +28,26 @@ dnl
dnl Process this file with autoconf to produce a configure script.
dnl
-AC_INIT([src/version.c])
-AC_PREREQ(2.59)
+AC_INIT([wget],
+ [m4_normalize(esyscmd([sed -e 's/^.*"\(.*\)";$/\1/' src/version.c]))],
+ [bug-wget@gnu.org])
+AC_PREREQ(2.61)
-dnl Include the M4 macros we use.
-builtin(include, [m4/wget.m4])dnl
-builtin(include, [m4/lib-ld.m4])dnl
-builtin(include, [m4/lib-link.m4])dnl
-builtin(include, [m4/lib-prefix.m4])dnl
+# Make configure depend on the VERSION file, since it's used in AC_INIT
+AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/src/version.c'])
dnl
dnl What version of Wget are we building?
dnl
-VERSION=`sed -e 's/^.*"\(.*\)";$/\1/' ${srcdir}/src/version.c`
-AC_MSG_NOTICE([configuring for GNU Wget $VERSION])
-AC_SUBST(VERSION)
-PACKAGE=wget
-AC_SUBST(PACKAGE)
+AC_MSG_NOTICE([configuring for GNU Wget $PACKAGE_VERSION])
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([.])
+
+dnl
+dnl Automake setup
+dnl
+AM_INIT_AUTOMAKE(1.9)
dnl
dnl Get cannonical host
@@ -89,20 +91,6 @@ case "${ENABLE_OPIE}${ENABLE_DIGEST}" in
*yes*)
wget_need_md5=yes
esac
-if test x"$ENABLE_OPIE" = xyes; then
- OPIE_OBJ='ftp-opie.o'
-fi
-AC_SUBST(OPIE_OBJ)
-
-dnl
-dnl Whether make sets $(MAKE)...
-dnl
-AC_PROG_MAKE_SET
-
-dnl
-dnl Find a good install
-dnl
-AC_PROG_INSTALL
dnl
dnl Find the compiler
@@ -113,8 +101,11 @@ test -z "$CFLAGS" && CFLAGS= auto_cflags=1
test -z "$CC" && cc_specified=yes
AC_PROG_CC
+AM_PROG_CC_C_O
AC_AIX
+AC_PROG_RANLIB
+
dnl Turn on optimization by default. Specifically:
dnl
dnl if the user hasn't specified CFLAGS, then
@@ -124,7 +115,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" ;;
@@ -134,16 +125,6 @@ if test -n "$auto_cflags"; then
fi
fi
-dnl
-dnl In case of {cyg,gnu}win32. Should be a _target_ test.
-dnl Might also be erelevant for DJGPP.
-dnl
-case "$host_os" in
- *win32) exeext='.exe';;
- *) exeext='';;
-esac
-AC_SUBST(exeext)
-
dnl
dnl Checks for basic compiler characteristics.
dnl
@@ -171,7 +152,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
@@ -182,13 +163,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, intptr_t, int64_t])
AC_CHECK_TYPES(sig_atomic_t, [], [], [
#include
#include
@@ -204,8 +186,12 @@ 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 usleep ftello sigblock sigsetjmp memrchr)
+
+if test x"$ENABLE_OPIE" = xyes; then
+ AC_LIBOBJ([ftp-opie])
+fi
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
@@ -231,54 +217,66 @@ dnl
dnl Check if we need to compile in getopt.c.
dnl
AC_CHECK_FUNC(getopt_long, [], [
- GETOPT_OBJ='getopt.o'
+ AC_LIBOBJ([getopt])
])
-AC_SUBST(GETOPT_OBJ)
dnl
dnl Checks for libraries.
dnl
-dnl Check for OpenSSL
-if test x"$with_ssl" != x"no"
-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().
- AC_CHECK_LIB(dl, dlopen, [], [
- AC_CHECK_LIB(dl, shl_load)
- ])
-
+AS_IF([test x"$with_ssl" = xgnutls], [
dnl Now actually check for -lssl
- AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
-#include
-#include
-#include
-#include
-#include
-#include
-#include
- ], [SSL_library_init ()])
- if test x"$LIBSSL" != x
+ AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
+#include
+ ], [gnutls_global_init()])
+ if test x"$LIBGNUTLS" != x
then
- AC_MSG_NOTICE([compiling in support for SSL])
- AC_DEFINE([HAVE_SSL], 1,
- [Define if SSL support is being compiled in.])
- SSL_OBJ='openssl.o'
+ AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
+ AC_LIBOBJ([gnutls])
+ else
+ AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
fi
-fi
-AC_SUBST(SSL_OBJ)
+], [
+ # --with-ssl is not gnutls: check if it's no
+ AS_IF([test x"$with_ssl" != xno], [
+ 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 shl_load().
+ AC_CHECK_LIB(dl, dlopen, [], [
+ AC_CHECK_LIB(dl, shl_load)
+ ])
+
+ dnl Now actually check for -lssl
+ AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
+ #include
+ #include
+ #include
+ #include
+ #include
+ #include
+ #include
+ ], [SSL_library_init ()])
+ if test x"$LIBSSL" != x
+ then
+ AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
+ AC_LIBOBJ([openssl])
+ elif test x"$with_ssl" != x
+ then
+ AC_MSG_ERROR([--with-ssl was given, but SSL is not available.])
+ fi
+ ]) # endif: --with-ssl == no?
+]) # endif: --with-ssl == gnutls?
+
dnl Enable NTLM if requested and if SSL is available.
-NTLM_OBJ=''
if test x"$LIBSSL" != x
then
if test x"$ENABLE_NTLM" != xno
then
AC_DEFINE([ENABLE_NTLM], 1,
[Define if you want the NTLM authorization support compiled in.])
- NTLM_OBJ='http-ntlm.o'
+ AC_LIBOBJ([http-ntlm])
fi
else
dnl If SSL is unavailable and the user explicitly requested NTLM,
@@ -288,7 +286,6 @@ else
AC_MSG_ERROR([NTLM authorization requested and OpenSSL not found; aborting])
fi
fi
-AC_SUBST(NTLM_OBJ)
dnl
dnl Find an MD5 implementation. Since Wget rarely needs MD5, we try
@@ -300,7 +297,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'
+ AC_LIBOBJ([gen-md5])
found_md5=no
dnl Check for the system MD5 library on Solaris. We don't check for
@@ -316,7 +313,7 @@ then
AC_COMPILE_IFELSE([#include
], [
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])
@@ -327,8 +324,8 @@ then
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
@@ -336,15 +333,14 @@ 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"
+ AC_DEFINE([HAVE_BUILTIN_MD5], 1, [Define when using built-in MD5.])
+ AC_LIBOBJ([gnu-md5])
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
AC_DEFINE([HAVE_MD5], 1, [Define if we're compiling support for MD5.])
-AC_SUBST(MD5_OBJ)
dnl **********************************************************************
dnl Checks for IPv6
@@ -463,11 +459,11 @@ 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 tests/WgetTest.pm
+ windows/Makefile])
AC_CONFIG_HEADERS([src/config.h])
AH_BOTTOM([
#include "config-post.h"
])
-AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
AC_CONFIG_COMMANDS([default], [WGET_PROCESS_PO])
AC_OUTPUT