dnl Template file for GNU Autoconf
-dnl Copyright (C) 1995, 1996, 1997, 2001, 2007,
-dnl 2008 Free Software Foundation, Inc.
+dnl Copyright (C) 1995, 1996, 1997, 2001, 2007, 2008, 2009 Free Software
+dnl 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 Process this file with autoconf to produce a configure script.
dnl
-AC_INIT([wget],
- [1.12-devel],
+AC_INIT([wget],
+ [1.12.1-devel],
[bug-wget@gnu.org])
AC_PREREQ(2.61)
AC_MSG_NOTICE([configuring for GNU Wget $PACKAGE_VERSION])
AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_AUX_DIR([build-aux])
dnl
dnl Automake setup
dnl
-AM_INIT_AUTOMAKE(1.9)
-
-dnl
-dnl Gettext
-dnl
-AM_GNU_GETTEXT([external],[need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.16.1])
+AM_INIT_AUTOMAKE(dist-bzip2 dist-lzma 1.9)
dnl
dnl Get cannonical host
AC_PROG_CC
AM_PROG_CC_C_O
AC_AIX
+
gl_EARLY
md5_EARLY
+dnl
+dnl Gettext
+dnl
+AM_GNU_GETTEXT([external],[need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.17])
+
AC_PROG_RANLIB
AC_PROG_LEX
AC_FUNC_FSEEKO
AC_CHECK_FUNCS(strptime timegm snprintf vsnprintf vasprintf drand48)
AC_CHECK_FUNCS(strtoll usleep ftello sigblock sigsetjmp memrchr wcwidth mbtowc)
+AC_CHECK_FUNCS(sleep symlink)
if test x"$ENABLE_OPIE" = xyes; then
AC_LIBOBJ([ftp-opie])
AC_DEFINE([HAVE_STRNCASECMP], 1, [Define to 1 if you have the `strncasecmp' function.])
AC_DEFINE([HAVE_STRDUP], 1, [Define to 1 if you have the `strdup' function.])
AC_DEFINE([HAVE_ISATTY], 1, [Define to 1 if you have the `isatty' function.])
-AC_DEFINE([HAVE_SYMLINK], 1, [Define to 1 if you have the `symlink' function.])
dnl
dnl Call Wget-specific macros defined in aclocal.
WGET_POSIX_CLOCK
WGET_NSL_SOCKET
+dnl Deal with specific hosts
+case $host_os in
+ *mingw32* )
+ AC_SUBST(W32LIBS, '-lwsock32')
+ AC_LIBOBJ([mswindows])
+ ;;
+esac
+
dnl
dnl Checks for libraries.
dnl
AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
[Support IDN/IRIs (needs GNU Libidn)]),
libidn=$withval, libidn="")
-if test "X$iri" != "Xno"; then
+AS_IF([test "X$iri" != "Xno"],[
AM_ICONV
if test "X$am_cv_func_iconv" != "Xyes"; then
AC_MSG_NOTICE([disabling IRIs because libiconv wasn't found])
fi
fi
-fi
+],[ # else
+ # For some reason, this seems to be set even when we don't check.
+ # Explicitly unset.
+ LIBICONV=
+])
if test "X$iri" != "Xno"; then
if test "$libidn" != ""; then
LDFLAGS="${LDFLAGS} -L$libidn/lib"
CPPFLAGS="${CPPFLAGS} -I$libidn/include"
fi
- AC_CHECK_HEADER(idna.h,
+
+ # If idna.h can't be found, check to see if it was installed under
+ # /usr/include/idn (OpenSolaris, at least, places it there).
+ # Check for idn-int.h in that case, because idna.h won't find
+ # idn-int.h until we've decided to add -I/usr/include/idn.
+ AC_CHECK_HEADER(idna.h, ,
+ [AC_CHECK_HEADER(idn/idn-int.h,
+ [CPPFLAGS="${CPPFLAGS} -I/usr/include/idn"],
+ [iri=no])]
+ )
+
+ if test "X$iri" != "Xno"; then
AC_CHECK_LIB(idn, stringprep_check_version,
- [iri=yes LIBS="${LIBS} -lidn"], iri=no),
- iri=no)
+ [iri=yes LIBS="${LIBS} -lidn"], iri=no)
+ fi
if test "X$iri" != "Xno" ; then
- AC_DEFINE(ENABLE_IRI, 1, [Define if IRI support is enabled.])
+ AC_DEFINE([ENABLE_IRI], 1, [Define if IRI support is enabled.])
AC_MSG_NOTICE([Enabling support for IRI.])
else
AC_MSG_WARN([Libidn not found])