- * Makefile.in, README, autogen.sh, configure.bat, configure.in,
- m4/wget.m4, util/Makefile.in, util/dist-wget: Updated license
+ 2007-11-28 Micah Cowan <micah@cowan.name>
+
++ * Makefile.am, README, autogen.sh, configure.bat, configure.in,
++ m4/wget.m4, util/Makefile.am, util/dist-wget: Updated license
+ exception for OpenSSL, per the SFLC.
+
+2007-10-23 Micah Cowan <micah@schmendrick>
+
+ * lib/stdbool.in.h, lib/stdint.in.h: gnulib-tool --update.
+ Includes fix for broken stdbool.h on Tru64.
+
+2007-10-22 Micah Cowan <micah@cowan.name>
+
+ * po/*.po: Refresh from TP and update-po.
+ * lib/Makefile.am, m4/gnulib-cache.m4, m4/longlong.m4,
+ m4/ulonglong.m4, maint.mk: gnulib-tool --update. Includes fix
+ for maint.mk with old versions of gzip.
+
+2007-10-18 Micah Cowan <micah@cowan.name>
+
+ * po/POTFILES.in: Removed no-longer-existing or generated files.
+ * autogen.sh: Reinstated, in case we have to do something at
+ some point other than autoreconf.
+ * Makefile.am: Put autogen.sh back in EXTRA_DIST. Just in case
+ someone needs to rebuild configure.
+ * configure.ac: Removed config-post.h inclusion from bottom of
+ generated config.h.
+
+2007-10-16 Micah Cowan <micah@cowan.name>
+
+ * README: Draw attention to wiki:PatchGuidelines.
+
+2007-10-14 Micah Cowan <micah@cowan.name>
+
+ * configure.ac: Let gnulib handle builtin MD5 functionality.
+ * NEWS: Mention gnulib.
+
+2007-10-13 Micah Cowan <micah@cowan.name>
+
+ * GNUMakefile, maint.mk: Added as part of the gnulib-ization.
+ * Makefile.am: gnulib-ized.
+ * configure.ac: gnulib-ized. Removed built-in getopt checks.
+
+2007-10-12 Micah Cowan <micah@cowan.name>
+
+ * PATCHES: Removed.
+ * NEWS: Updated info about source repositories, removal of
+ PATCHES file.
+
+2007-10-09 Micah Cowan <micah@cowan.name>
+
+ * configure.in: Renamed to configure.ac
+ * configure.ac: Renamed from configure.in. Added invocations of
+ AM_GNU_GETTEXT, etc. Added en@quot and en@boldquot pseudo-LINGUA
+ support.
+ * ABOUT-NLS: Added back in (required by autoreconf :\).
+ * Makefile.am: Added ABOUT-NLS and msdos/Makefile.WC to EXTRA_DIST.
+ * m4/wget.m4: Removed no-longer-used NLS stuff.
+ * Makefile.in.in: Restore previous policy of not updating .po's
+ unless explicitly asked (via update-po).
+
+2007-10-09 gettextize <bug-gnu-gettext@gnu.org>
+
+ * m4/gettext.m4: New file, from gettext-0.16.1.
+ * m4/iconv.m4: New file, from gettext-0.16.1.
+ * m4/lib-ld.m4: Upgrade to gettext-0.16.1.
+ * m4/lib-link.m4: Upgrade to gettext-0.16.1.
+ * m4/lib-prefix.m4: Upgrade to gettext-0.16.1.
+ * m4/nls.m4: New file, from gettext-0.16.1.
+ * m4/po.m4: New file, from gettext-0.16.1.
+ * m4/progtest.m4: New file, from gettext-0.16.1.
+ * po/Makefile.in.in: Upgrade to gettext-0.16.1.
+ * po/Rules-quot: New file, from gettext-0.16.1.
+ * po/boldquot.sed: New file, from gettext-0.16.1.
+ * po/en@boldquot.header: New file, from gettext-0.16.1.
+ * po/en@quot.header: New file, from gettext-0.16.1.
+ * po/insert-header.sin: New file, from gettext-0.16.1.
+ * po/quot.sed: New file, from gettext-0.16.1.
+ * po/remove-potcdate.sin: New file, from gettext-0.16.1.
+
+2007-10-08 Micah Cowan <micah@cowan.name>
+
+ * AUTHORS: Credit to Ralf Wildenhues for automakifying patches.
+
+2007-10-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * po/Makefile.in.in: Since `distdir' is used now, adjust
+ DISTFILES to the missing ChangeLog file.
+ Add trivial targets ps, pdf, html.
+ * Makefile.in: Removed, replaced by Makefile.am.
+ * Makefile.am: Converted from Makefile.in.
+ * util/Makefile.in: Removed, replaced by Makefile.am.
+ * util/Makefile.am: Converted from Makefile.in.
+ * configure.in: Adjust for automake support.
+
2007-10-05 Micah Cowan <micah@cowan.name>
* config.guess, config.sub, install-sh: Update from versions
--- /dev/null
- # In addition, as a special exception, the Free Software Foundation
- # gives permission to link the code of its release of Wget with the
- # OpenSSL project's "OpenSSL" library (or with modified versions of it
- # that use the same license as the "OpenSSL" library), and distribute
- # the linked executables. You must obey the GNU General Public License
- # in all respects for all of the code used other than "OpenSSL". If you
- # modify this file, you may extend this exception to your version of the
- # file, but you are not obligated to do so. If you do not wish to do
- # so, delete this exception statement from your version.
+# Makefile for `Wget' utility
+# Copyright (C) 1995, 1996, 1997, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2006, 2007 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++# Additional permission under GNU GPL version 3 section 7
++
++# If you modify this program, or any covered work, by linking or
++# combining it with the OpenSSL project's OpenSSL library (or a
++# modified version of that library), containing parts covered by the
++# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
++# grants you additional permission to convey the resulting work.
++# Corresponding Source for a non-source form of such a combination
++# shall include the source code for the parts of OpenSSL used as well
++# as that of the covered work.
+
+#
+# Version: @VERSION@
+#
+
+# Search for macros in the m4 subdirectory:
+ACLOCAL_AMFLAGS = -I m4
+
+# subdirectories in the distribution
+SUBDIRS = lib src doc po tests util windows
+
+test: all
+ cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
+
+EXTRA_DIST = ChangeLog.README configure.bat MAILING-LIST \
+ msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \
+ msdos/Makefile.WC ABOUT-NLS autogen.sh
+
+CLEANFILES = *~ *.bak $(DISTNAME).tar.gz
--- /dev/null
- 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
- dnl OpenSSL project's "OpenSSL" library (or with modified versions of it
- dnl that use the same license as the "OpenSSL" library), and distribute
- dnl the linked executables. You must obey the GNU General Public License
- dnl in all respects for all of the code used other than "OpenSSL". If you
- dnl modify this file, you may extend this exception to your version of the
- dnl file, but you are not obligated to do so. If you do not wish to do
- dnl so, delete this exception statement from your version.
+dnl Template file for GNU Autoconf
+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 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,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+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, see <http://www.gnu.org/licenses/>.
+
++dnl Additional permission under GNU GPL version 3 section 7
++
++dnl If you modify this program, or any covered work, by linking or
++dnl combining it with the OpenSSL project's OpenSSL library (or a
++dnl modified version of that library), containing parts covered by the
++dnl terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
++dnl grants you additional permission to convey the resulting work.
++dnl Corresponding Source for a non-source form of such a combination
++dnl shall include the source code for the parts of OpenSSL used as well
++dnl as that of the covered work.
+
+dnl
+dnl Process this file with autoconf to produce a configure script.
+dnl
+
+AC_INIT([wget],
+ [1.12-devel],
+ [bug-wget@gnu.org])
+AC_PREREQ(2.61)
+
+dnl
+dnl What version of Wget are we building?
+dnl
+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 Gettext
+dnl
+AM_GNU_GETTEXT([external],[need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.16.1])
+
+dnl
+dnl Get cannonical host
+dnl
+AC_CANONICAL_HOST
+AC_DEFINE_UNQUOTED([OS_TYPE], "$host_os",
+ [Define to be the name of the operating system.])
+
+dnl
+dnl Process features.
+dnl
+
+AC_ARG_WITH(ssl,
+[[ --without-ssl disable SSL autodetection]])
+
+AC_ARG_ENABLE(opie,
+[ --disable-opie disable support for opie or s/key FTP login],
+ENABLE_OPIE=$enableval, ENABLE_OPIE=yes)
+test x"${ENABLE_OPIE}" = xyes && AC_DEFINE([ENABLE_OPIE], 1,
+ [Define if you want the Opie support for FTP compiled in.])
+
+AC_ARG_ENABLE(digest,
+[ --disable-digest disable support for HTTP digest authorization],
+ENABLE_DIGEST=$enableval, ENABLE_DIGEST=yes)
+test x"${ENABLE_DIGEST}" = xyes && AC_DEFINE([ENABLE_DIGEST], 1,
+ [Define if you want the HTTP Digest Authorization compiled in.])
+
+AC_ARG_ENABLE(ntlm,
+[ --disable-ntlm disable support for NTLM authorization],
+[ENABLE_NTLM=$enableval], [ENABLE_NTLM=auto])
+
+AC_ARG_ENABLE(debug,
+[ --disable-debug disable support for debugging output],
+ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes)
+test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE([ENABLE_DEBUG], 1,
+ [Define if you want the debug output support compiled in.])
+
+wget_need_md5=no
+
+case "${ENABLE_OPIE}${ENABLE_DIGEST}" in
+*yes*)
+ wget_need_md5=yes
+esac
+
+dnl
+dnl Find the compiler
+dnl
+
+dnl We want these before the checks, so the checks can modify their values.
+test -z "$CFLAGS" && CFLAGS= auto_cflags=1
+test -z "$CC" && cc_specified=yes
+
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_AIX
+gl_EARLY
+
+AC_PROG_RANLIB
+
+dnl Turn on optimization by default. Specifically:
+dnl
+dnl if the user hasn't specified CFLAGS, then
+dnl if compiler is gcc, then
+dnl use -O2 and some warning flags
+dnl else
+dnl use os-specific flags or -O
+if test -n "$auto_cflags"; then
+ if test -n "$GCC"; then
+ CFLAGS="$CFLAGS -O2 -Wall"
+ else
+ case "$host_os" in
+ *hpux*) CFLAGS="$CFLAGS +O3" ;;
+ *ultrix* | *osf*) CFLAGS="$CFLAGS -O -Olimit 2000" ;;
+ *) CFLAGS="$CFLAGS -O" ;;
+ esac
+ fi
+fi
+
+dnl
+dnl Checks for basic compiler characteristics.
+dnl
+AC_C_CONST
+AC_C_INLINE
+AC_C_VOLATILE
+
+dnl Check for basic headers, even though we expect them to exist and
+dnl #include them unconditionally in the code. Their detection is
+dnl still needed because test programs used by Autoconf macros check
+dnl for STDC_HEADERS, HAVE_SYS_TYPES_H, etc. before using them.
+dnl Without the checks they will fail to be included in test programs,
+dnl which will subsequently fail.
+AC_HEADER_STDC
+
+dnl Check for large file support. This check needs to come fairly
+dnl early because it could (in principle) affect whether functions and
+dnl headers are available, whether they work, etc.
+AC_SYS_LARGEFILE
+AC_CHECK_SIZEOF(off_t)
+
+dnl
+dnl Checks for system header files that might be missing.
+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 pwd.h)
+
+dnl
+dnl Check sizes of integer types. These are used to find n-bit
+dnl integral types on older systems that fail to provide intN_t and
+dnl uintN_t typedefs.
+dnl
+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, uintptr_t, intptr_t, int64_t])
+AC_CHECK_TYPES(sig_atomic_t, [], [], [
+#include <stdio.h>
+#include <sys/types.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#include <signal.h>
+])
+
+# gnulib
+gl_INIT
+
+dnl
+dnl Checks for library functions.
+dnl
+AC_FUNC_ALLOCA
+AC_FUNC_MMAP
+AC_FUNC_FSEEKO
+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
+dnl Wget can still be ported to non-Unix systems (such as Windows)
+dnl that lack some of these functions.
+AC_DEFINE([HAVE_STRCASECMP], 1, [Define to 1 if you have the `strcasecmp' function.])
+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.
+dnl
+WGET_STRUCT_UTIMBUF
+WGET_SOCKLEN_T
+WGET_FNMATCH
+WGET_NANOSLEEP
+WGET_POSIX_CLOCK
+WGET_NSL_SOCKET
+
+dnl
+dnl Checks for libraries.
+dnl
+
+AS_IF([test x"$with_ssl" = xgnutls], [
+ 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])
+ AC_LIBOBJ([gnutls])
+ else
+ AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
+ fi
+], [
+ # --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 <openssl/ssl.h>
+ #include <openssl/x509.h>
+ #include <openssl/err.h>
+ #include <openssl/rand.h>
+ #include <openssl/des.h>
+ #include <openssl/md4.h>
+ #include <openssl/md5.h>
+ ], [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.
+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.])
+ AC_LIBOBJ([http-ntlm])
+ fi
+else
+ dnl If SSL is unavailable and the user explicitly requested NTLM,
+ dnl abort.
+ if test x"$ENABLE_NTLM" = xyes
+ then
+ AC_MSG_ERROR([NTLM authorization requested and OpenSSL not found; aborting])
+ fi
+fi
+
+dnl
+dnl Find an MD5 implementation. Since Wget rarely needs MD5, we try
+dnl to use an existing library implementation to save on code size.
+dnl
+
+if test x"$wget_need_md5" = xyes
+then
+ dnl This should be moved to an AC_DEFUN, but I'm not sure how to
+ dnl manipulate MD5_OBJ from the defun.
+
+ AC_LIBOBJ([gen-md5])
+ found_md5=no
+
+ dnl Check for the system MD5 library on Solaris. We don't check for
+ dnl something simple like "MD5Update" because there are a number of
+ dnl MD5 implementations that use that name, but have an otherwise
+ dnl incompatible interface. md5_calc is, hopefully, specific to the
+ dnl Solaris MD5 library.
+ if test x"$found_md5" = xno; then
+ AC_CHECK_LIB(md5, md5_calc, [
+ dnl Some installations have bogus <md5.h> in the compiler's
+ dnl include path, making the system md5 library useless.
+ AC_MSG_CHECKING([for working md5.h])
+ AC_COMPILE_IFELSE([#include <md5.h>
+ ], [
+ AC_MSG_RESULT(yes)
+ 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])
+ ], [AC_MSG_RESULT(no)])
+ ])
+ fi
+
+ 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"$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
+ 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 when using built-in MD5.])
+ found_md5=yes
+ 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.])
+
+dnl **********************************************************************
+dnl Checks for IPv6
+dnl **********************************************************************
+
+dnl
+dnl We test for IPv6 by checking, in turn, for availability of
+dnl getaddrinfo, presence of the INET6 address/protocol family, and
+dnl the existence of struct sockaddr_in6. If any of them is missing,
+dnl IPv6 is disabled, and the code reverts to old-style gethostbyname.
+dnl
+dnl If --enable-ipv6 is explicitly specified on the configure command
+dnl line, we check for IPv6 and abort if not found. If --disable-ipv6
+dnl is specified, we disable IPv6 and don't check for it. The default
+dnl is to autodetect IPv6 and use it where available.
+dnl
+
+AC_ARG_ENABLE(ipv6,
+ AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]),
+ [case "${enable_ipv6}" in
+ no)
+ AC_MSG_NOTICE([disabling IPv6 at user request])
+ dnl Disable IPv6 checking
+ ipv6=no
+ ;;
+ yes)
+ dnl IPv6 explicitly enabled: force its use (abort if unavailable).
+ ipv6=yes
+ force_ipv6=yes
+ ;;
+ auto)
+ dnl Auto-detect IPv6, i.e. check for IPv6, but don't force it.
+ ipv6=yes
+ ;;
+ *)
+ AC_MSG_ERROR([Invalid --enable-ipv6 argument \`$enable_ipv6'])
+ ;;
+ esac
+ ], [
+ dnl If nothing is specified, assume auto-detection.
+ ipv6=yes
+ ]
+)
+
+if test "X$ipv6" = "Xyes"; then
+ AC_CHECK_FUNCS(getaddrinfo, [], [
+ AC_MSG_NOTICE([Disabling IPv6 support: your system does not support getaddrinfo(3)])
+ ipv6=no
+ ])
+fi
+
+if test "X$ipv6" = "Xyes"; then
+ PROTO_INET6([], [
+ AC_MSG_NOTICE([Disabling IPv6 support: your system does not support the PF_INET6 protocol family])
+ ipv6=no
+ ])
+fi
+
+if test "X$ipv6" = "Xyes"; then
+ TYPE_STRUCT_SOCKADDR_IN6([],[
+ AC_MSG_NOTICE([Disabling IPv6 support: your system does not support \`struct sockaddr_in6'])
+ ipv6=no
+ ])
+ if test "X$ipv6" = "Xyes"; then
+ WGET_STRUCT_SOCKADDR_STORAGE
+ MEMBER_SIN6_SCOPE_ID
+ fi
+fi
+
+if test "X$ipv6" = "Xyes"; then
+ AC_DEFINE([ENABLE_IPV6], 1, [Define if IPv6 support is enabled.])
+ AC_MSG_NOTICE([Enabling support for IPv6.])
+elif test "x$force_ipv6" = "xyes"; then
+ AC_MSG_ERROR([IPv6 support requested but not found; aborting])
+fi
+
+
+dnl
+dnl Set of available languages.
+dnl
+dnl Originally this used to be static, looking like this:
+dnl ALL_LINGUAS="cs de hr it ..."
+dnl The downside was that configure needed to be rebuilt whenever a
+dnl new language was added.
+dnl
+ALL_LINGUAS="en@quot en@boldquot $(cd ${srcdir}/po && ls *.po | grep -v 'en@.*quot' | sed -e 's/\.po$//' | tr '\012' ' ')"
+
+dnl
+dnl Find makeinfo. We used to provide support for Emacs processing
+dnl Texinfo using `emacs -batch -eval ...' where makeinfo is
+dnl unavailable, but that broke with the addition of makeinfo-specific
+dnl command-line options, such as `-I'. Now we depend on makeinfo to
+dnl build the Info documentation.
+dnl
+
+AC_CHECK_PROGS(MAKEINFO, [makeinfo], [true])
+
+dnl
+dnl Find perl and pod2man
+dnl
+
+AC_PATH_PROGS(PERL, [perl5 perl], no)
+AC_PATH_PROG(POD2MAN, pod2man, no)
+
+if test "x${POD2MAN}" = xno; then
+ COMMENT_IF_NO_POD2MAN="# "
+else
+ COMMENT_IF_NO_POD2MAN=
+fi
+AC_SUBST(COMMENT_IF_NO_POD2MAN)
+
+dnl
+dnl Create output
+dnl
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile
+ po/Makefile.in tests/Makefile tests/WgetTest.pm
+ lib/Makefile windows/Makefile])
+AC_CONFIG_HEADERS([src/config.h])
+AC_OUTPUT
+ 2007-11-28 Micah Cowan <micah@cowan.name>
+
+ * config.h: Updated license exception for OpenSSL, per the SFLC.
+
+2007-10-15 Gisle Vanem <gvanem@broadpark.no>
+
+ * config.h: Added some HAVE_* for djgpp 2.04 and Watcom 1.7+.
+
+ * Makefile.DJ: rewritten for including some files from ../lib.
+
+ * Makefile.WC: Ditto. Handling source-files out-of current
+ directory makes compliation a bit more painfull. AFAICS, one
+ must use explicit rules.
+
+2007-10-02 Gisle Vanem <gvanem@broadpark.no>
+
+ * config.h: Removed unused defines, added needed 'HAVE_*' defines.
+
+ * Makefile.DJ: rewritten to be used from './src' directory.
+ Added '-DOPENSSL_NO_KRB5' for OpenSSL build. Target is
+ now wget.exe.
+
+ * Makefile.WC: Added for building with OpenWatcom targeting
+ 32-bit DOS (DOS32A extender).
+
2007-09-24 Gisle Vanem <giva@bgnett.no>
* Makefile.DJ, config.h: Added to support building on MS-DOS via
- * Makefile.in, cmpt.c, connect.c, connect.h, convert.c,
+ 2007-11-28 Micah Cowan <micah@cowan.name>
+
++ * Makefile.am, cmpt.c, connect.c, connect.h, convert.c,
+ convert.h, cookies.c, cookies.h, ftp-basic.c, ftp-ls.c,
+ ftp-opie.c, ftp.c, ftp.h, gen-md5.c, gen-md5.h, gnutls.c,
+ hash.c, hash.h, host.c, host.h, html-parse.c, html-parse.h,
+ html-url.c, http-ntlm.c, http-ntlm.h, http.c, http.h, init.c,
+ init.h, log.c, log.h, main.c, mswindows.c, mswindows.h,
+ netrc.c, netrc.h, openssl.c, options.h, progress.c, progress.h,
+ ptimer.c, ptimer.h, recur.c, recur.h, res.c, res.h, retr.c,
+ retr.h, safe-ctype.c, safe-ctype.h, spider.c, spider.h, ssl.h,
+ sysdep.h, test.c, test.h, url.c, url.h, utils.c, utils.h,
+ wget.h, xmalloc.c, xmalloc.h: Updated license exception for
+ OpenSSL, per the SFLC.
+
+2007-10-30 Micah Cowan <micah@cowan.name>
+
+ * main.c (main): Declare argv parameter as char **argv, rather
+ than char *const *argv. This fixes usage of getopt_long,
+ regardless of whether getopt_long has a constified argv or not.
+
+2007-10-22 Gisle Vanem <gvanem@broadpark.no>
+
+ * mswindows.c: Move INHIBIT_WRAP macro definition up with wget.h
+ inclusion.
+
+2007-10-18 Steven Schweda <sms@antinode.org>
+
+ * sysdep.h: #include <stdint.h> as well as <inttypes.h>, to work
+ around a glitch on Tru64 systems.
+
+2007-10-18 Micah Cowan <micah@cowan.name>
+
+ * Makefile.am: version.c should not be distributed. Removed
+ config-post.h. Add version.c dependency and gnulib include path
+ for libunittest.a.
+ * sysdep.h: Got contents of config-post.h
+ * config-post.h: Removed.
+ * wget.h: #include "config.h".
+ * alloca.c, cmpt.c, connect.c, convert.c, cookies.c,
+ ftp-basic.c, ftp-ls.c, ftp-opie.c, ftp.c, gen-md5.c, gnutls.c,
+ hash.c, host.c, html-parse.c, html-url.c, http-ntlm.c, http.c,
+ init.c, log.c, main.c, mswindows.c, netrc.c, openssl.c,
+ progress.c, ptimer.c, recur.c, res.c, retr.c, spider.c, url.c,
+ utils.c, xmalloc.c: Use wget.h at very top, and instead of
+ config.h.
+
+2007-10-15 Micah Cowan <micah@cowan.name>
+
+ * Makefile.am: Remove intermediary hg-id file generation, make
+ version.c-generation more portable.
+
+2007-10-14 Micah Cowan <micah@cowan.name>
+
+ * cmpt.c, cookies.c, ftp-basic.c, ftp-ls.c, ftp.c, hash.c,
+ host.c, html-parse.c, html-url.c, http-ntlm.c, http.c, init.c,
+ log.c, main.c, netrc.c, openssl.c, res.c, url.c, utils.c,
+ wget.h: Replace uses of ISSPACE, etc with c_isspace, etc.
+ * gnu-md5.c, gnu-md5.h: Removed, in deference to gnulib.
+ * Makefile.am: Removed gnu-md5.h from wget_SOURCES.
+ * gen-md5.c: Changed #inclusion of gnu-md5.h to md5.h (gnulib's).
+ * recur.c (download_child_p): Print error if unlink of
+ robots.txt fails.
+ * main.c (main): --spider or --delete-after now implies
+ --no-directories (thanks, Josh Williams).
+
+2007-10-14 Joshua David Williams <yurimxpxman@gmail.com>
+
+ * recur.c (download_child_p): Remove robots.txt if
+ --delete-after or --spider is on.
+
+2007-10-13 Micah Cowan <micah@cowan.name>
+
+ * Makefile.am: Make version.c depend on Wget dependencies (source
+ files, plus such things as LIBOBJS so we get things like
+ http-ntlm.c). Removed getopt.[ch], as we're now using gnulib for
+ these.
+
+2007-10-10 Micah Cowan <micah@cowan.name>
+
+ * http-ntlm.c: Include openssl/opensslv.h explicitly, instead of
+ hoping it'll be included by accident in openssl/des.h.
+
+2007-10-09 Gisle Vanem <gvanem@broadpark.no>
+
+ * mswindows.c: 'argc' and 'argv' in 'windows_main()' are no longer
+ needed. Hence simply the prototype. Free 'exec_name' at exit.
+
+2007-10-09 Micah Cowan <micah@cowan.name>
+
+ * gettext.h: Imported from /usr/share/gettext, fuller handling
+ of --disable-nls.
+ * wget.h: Remove logic for handling lack of NLS (now in
+ gettext.h).
+ * main.c: Use gettext's ENABLE_NLS rather than HAVE_NLS.
+ * Makefile.am: added @LIBINTL@ to LIBS (though it probably
+ belongs in LDADD, along with everything else currently assigned
+ to LIBS).
+
+2007-10-08 Micah Cowan <micah@cowan.name>
+
+ * http.c (http_loop): Add send_head_first conditional back
+ around code that needs it, but not around the last-modified
+ header-parsing stuff this time. Removed no-longer-useful (was it
+ ever?) restart_loop boolean, continuing unconditionally at end
+ of send_head_first conditional block (if we haven't jumped out).
+
2007-10-04 Micah Cowan <micah@cowan.name>
* http.c (http_loop): We've got_name if content_disposition
--- /dev/null
- # In addition, as a special exception, the Free Software Foundation
- # gives permission to link the code of its release of Wget with the
- # OpenSSL project's "OpenSSL" library (or with modified versions of it
- # that use the same license as the "OpenSSL" library), and distribute
- # the linked executables. You must obey the GNU General Public License
- # in all respects for all of the code used other than "OpenSSL". If you
- # modify this file, you may extend this exception to your version of the
- # file, but you are not obligated to do so. If you do not wish to do
- # so, delete this exception statement from your version.
+# Makefile for `wget' utility
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+# 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Wget. If not, see <http://www.gnu.org/licenses/>.
+
++# Additional permission under GNU GPL version 3 section 7
++
++# If you modify this program, or any covered work, by linking or
++# combining it with the OpenSSL project's OpenSSL library (or a
++# modified version of that library), containing parts covered by the
++# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
++# grants you additional permission to convey the resulting work.
++# Corresponding Source for a non-source form of such a combination
++# shall include the source code for the parts of OpenSSL used as well
++# as that of the covered work.
+
+#
+# Version: @VERSION@
+#
+
+# The following line is losing on some versions of make!
+DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
+LIBS = @LIBS@ @LIBSSL@ @LIBGNUTLS@ @LIBINTL@
+
+bin_PROGRAMS = wget
+wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c ftp-basic.c \
+ ftp-ls.c hash.c host.c html-parse.c html-url.c http.c \
+ init.c log.c main.c netrc.c progress.c ptimer.c recur.c \
+ res.c retr.c snprintf.c spider.c url.c \
+ utils.c xmalloc.c \
+ connect.h convert.h cookies.h \
+ ftp.h gen-md5.h hash.h host.h html-parse.h \
+ http.h http-ntlm.h init.h log.h mswindows.h netrc.h \
+ options.h progress.h ptimer.h recur.h res.h retr.h \
+ spider.h ssl.h sysdep.h url.h utils.h wget.h xmalloc.h
+nodist_wget_SOURCES = version.c
+EXTRA_wget_SOURCES = mswindows.c
+LDADD = $(ALLOCA) $(LIBOBJS) ../lib/libgnu.a
+AM_CPPFLAGS = -I$(top_srcdir)/lib
+
+version.c: $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am
+ echo 'const char *version_string = "@VERSION@"' > $@
+ -hg log -r . --template='" ({node|short})"\n' 2>/dev/null >> $@
+ echo ';' >> $@
+
+check_LIBRARIES = libunittest.a
+libunittest_a_SOURCES = $(wget_SOURCES) test.c test.h
+nodist_libunittest_a_SOURCES = version.c
+libunittest_a_CPPFLAGS = -DTESTING -I$(top_srcdir)/lib
+libunittest_a_LIBADD = $(ALLOCA) $(LIBOBJS)
+
+CLEANFILES = *~ *.bak core core.[0-9]* version.c
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <assert.h>
#include <stdio.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
#include "wget.h"
#include "gen-md5.h"
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <assert.h>
#include <errno.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <string.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
/* NTLM details:
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <string.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#define INHIBIT_WRAP /* avoid wrapping of socket, bind, ... */
+
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <assert.h>
#include <errno.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <errno.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of its release of Wget with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so. If you do not wish to do
- so, delete this exception statement from your version. */
+ Additional permission under GNU GPL version 3 section 7
+
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work. */
-#include <config.h>
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
- * Makefile.in: Updated license exception for OpenSSL, per the
+ 2007-11-28 Micah Cowan <micah@cowan.name>
+
++ * Makefile.am: Updated license exception for OpenSSL, per the
+ SFLC.
+
+2007-10-18 Micah Cowan <micah@cowan.name>
+
+ * Makefile.am: Add dependency for unit_tests on libgnu.a.
+
+2007-10-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * WgetTest.pm.in: wget is built in the build tree. Use an
+ absolute path to the binary.
+ * Makefile.in: Removed, replaced by Makefile.am.
+ * Makefile.am: Converted from Makefile.in.
+
2007-09-25 Micah Cowan <micah@cowan.name>
* Makefile.in: Use EXEEXT instead of exeext.
--- /dev/null
- # In addition, as a special exception, the Free Software Foundation
- # gives permission to link the code of its release of Wget with the
- # OpenSSL project's "OpenSSL" library (or with modified versions of it
- # that use the same license as the "OpenSSL" library), and distribute
- # the linked executables. You must obey the GNU General Public License
- # in all respects for all of the code used other than "OpenSSL". If you
- # modify this file, you may extend this exception to your version of the
- # file, but you are not obligated to do so. If you do not wish to do
- # so, delete this exception statement from your version.
+# Makefile for `wget' utility
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+# 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Wget. If not, see <http://www.gnu.org/licenses/>.
+
++# Additional permission under GNU GPL version 3 section 7
++
++# If you modify this program, or any covered work, by linking or
++# combining it with the OpenSSL project's OpenSSL library (or a
++# modified version of that library), containing parts covered by the
++# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
++# grants you additional permission to convey the resulting work.
++# Corresponding Source for a non-source form of such a combination
++# shall include the source code for the parts of OpenSSL used as well
++# as that of the covered work.
+
+#
+# Version: @VERSION@
+#
+
+PERL = perl
+PERLRUN = $(PERL) -I$(srcdir)
+
+.PHONY: test run-unit-tests run-px-tests
+
+check-local: test
+
+test: ../src/wget$(EXEEXT) run-unit-tests #run-px-tests
+
+../src/wget$(EXEEXT):
+ cd ../src && $(MAKE) $(AM_MAKEFLAGS)
+
+run-unit-tests: unit-tests$(EXEEXT)
+ ./unit-tests$(EXEEXT)
+
+run-px-tests: WgetTest.pm
+ $(PERLRUN) $(srcdir)/Test-auth-basic.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-c-full.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-c-partial.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-c.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-E-k-K.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-E-k.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-ftp.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-HTTP-Content-Disposition-1.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-HTTP-Content-Disposition-2.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-HTTP-Content-Disposition.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-N-current-HTTP-CD.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-N-current.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-N-HTTP-Content-Disposition.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-N--no-content-disposition.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-N--no-content-disposition-trivial.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test--no-content-disposition.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test--no-content-disposition-trivial.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-N-old.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-nonexisting-quiet.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-noop.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-np.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-N.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-O-HTTP-Content-Disposition.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-O--no-content-disposition.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-O--no-content-disposition-trivial.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-O-nonexisting.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-O.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-Restrict-Lowercase.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test-Restrict-Uppercase.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test--spider-fail.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test--spider-HTTP-Content-Disposition.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test--spider--no-content-disposition.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test--spider--no-content-disposition-trivial.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test--spider.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test--spider-r-HTTP-Content-Disposition.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test--spider-r--no-content-disposition.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test--spider-r--no-content-disposition-trivial.px && echo && echo
+ $(PERLRUN) $(srcdir)/Test--spider-r.px && echo && echo
+
+EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
+ Test-auth-basic.px Test-c-full.px Test-c-partial.px \
+ Test-c.px Test-E-k-K.px Test-E-k.px Test-ftp.px \
+ Test-HTTP-Content-Disposition-1.px \
+ Test-HTTP-Content-Disposition-2.px \
+ Test-HTTP-Content-Disposition.px \
+ Test-N-current.px Test-N-old.px Test-nonexisting-quiet.px \
+ Test-noop.px Test-np.px Test-N.px \
+ Test-O-nonexisting.px Test-O.px \
+ Test-Restrict-Lowercase.px Test-Restrict-Uppercase.px \
+ Test--spider-fail.px Test--spider.px Test--spider-r.px
+
+check_PROGRAMS = unit-tests
+unit_tests_SOURCES =
+LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@
+
+CLEANFILES = *~ *.bak core core.[0-9]*
--- /dev/null
- # In addition, as a special exception, the Free Software Foundation
- # gives permission to link the code of its release of Wget with the
- # OpenSSL project's "OpenSSL" library (or with modified versions of it
- # that use the same license as the "OpenSSL" library), and distribute
- # the linked executables. You must obey the GNU General Public License
- # in all respects for all of the code used other than "OpenSSL". If you
- # modify this file, you may extend this exception to your version of the
- # file, but you are not obligated to do so. If you do not wish to do
- # so, delete this exception statement from your version.
+# Makefile for `wget' utility
+# Copyright (C) 1995, 1996, 1997, 2007 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++# Additional permission under GNU GPL version 3 section 7
++
++# If you modify this program, or any covered work, by linking or
++# combining it with the OpenSSL project's OpenSSL library (or a
++# modified version of that library), containing parts covered by the
++# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
++# grants you additional permission to convey the resulting work.
++# Corresponding Source for a non-source form of such a combination
++# shall include the source code for the parts of OpenSSL used as well
++# as that of the covered work.
+
+#
+# Version: @VERSION@
+#
+
+EXTRA_DIST = dist-wget download.html download-netscape.html \
+ rmold.pl update_po_files.sh wget.spec
- * Makefile.doc, Makefile.in, Makefile.src, Makefile.top,
+ 2007-11-28 Micah Cowan <micah@cowan.name>
+
++ * Makefile.doc, Makefile.am, Makefile.src, Makefile.top,
+ Makefile.top.bor, Makefile.top.mingw, config-compiler.h: Updated
+ license exception for OpenSSL, per the SFLC.
+
+2007-10-15 Gisle Vanem <giva@bgnett.no>
+
+ * config-compiler.h: Adjust for OpenWacom 1.7's _Bool fix.
+
+2007-10-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * Makefile.in: Removed, replaced by Makefile.am.
+ * Makefile.am: Converted from Makefile.in.
+
2007-09-24 Christopher Lewis <chris@christopherlewis.com>
* config-compiler.h: Fix compiler warnings related to
--- /dev/null
- # In addition, as a special exception, the Free Software Foundation
- # gives permission to link the code of its release of Wget with the
- # OpenSSL project's "OpenSSL" library (or with modified versions of it
- # that use the same license as the "OpenSSL" library), and distribute
- # the linked executables. You must obey the GNU General Public License
- # in all respects for all of the code used other than "OpenSSL". If you
- # modify this file, you may extend this exception to your version of the
- # file, but you are not obligated to do so. If you do not wish to do
- # so, delete this exception statement from your version.
+# Makefile for `wget' utility
+# Copyright (C) 1995, 1996, 1997, 2007 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++# Additional permission under GNU GPL version 3 section 7
++
++# If you modify this program, or any covered work, by linking or
++# combining it with the OpenSSL project's OpenSSL library (or a
++# modified version of that library), containing parts covered by the
++# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
++# grants you additional permission to convey the resulting work.
++# Corresponding Source for a non-source form of such a combination
++# shall include the source code for the parts of OpenSSL used as well
++# as that of the covered work.
+
+#
+# Version: @VERSION@
+#
+
+# This file is just a stub, so that the build subprocess in `windows'
+# succeeds. This directory is not used under Unix builds, normally
+# affected by Makefile.in.
+
+EXTRA_DIST = config-compiler.h config.h Makefile.doc \
+ Makefile.src Makefile.src.bor Makefile.src.mingw \
+ Makefile.top Makefile.top.bor Makefile.top.mingw
projects / wget / commitdiff