-diff -Nur wget-1.8.2.orig/acinclude.m4 wget-1.8.2/acinclude.m4
---- wget-1.8.2.orig/acinclude.m4 Thu Jan 1 01:00:00 1970
-+++ wget-1.8.2/acinclude.m4 Wed Jun 5 20:45:08 2002
+diff -urN wget-1.9-beta3.org/acinclude.m4 wget-1.9-beta3/acinclude.m4
+--- wget-1.9-beta3.org/acinclude.m4 1970-01-01 01:00:00.000000000 +0100
++++ wget-1.9-beta3/acinclude.m4 2003-10-03 12:07:21.000000000 +0200
@@ -0,0 +1,11 @@
+AC_DEFUN(WGET_STRUCT_UTIMBUF,
+[AC_MSG_CHECKING(for struct utimbuf)
+else
+ AC_MSG_RESULT(no)
+fi])
-diff -Nur wget-1.8.2.orig/configure.in wget-1.8.2/configure.in
---- wget-1.8.2.orig/configure.in Sat May 18 05:05:11 2002
-+++ wget-1.8.2/configure.in Wed Jun 5 20:44:55 2002
+diff -urN wget-1.9-beta3.org/configure.in wget-1.9-beta3/configure.in
+--- wget-1.9-beta3.org/configure.in 2003-10-03 12:07:14.000000000 +0200
++++ wget-1.9-beta3/configure.in 2003-10-03 12:15:57.000000000 +0200
@@ -46,14 +46,14 @@
dnl Get cannonical host
dnl
+[AC_DEFINE(HAVE_SOCKS,,[Use the socks library])])
AC_ARG_WITH(ssl,
- [ --with-ssl[=SSL-ROOT] link with SSL support [default=auto]
+ [[ --with-ssl[=SSL-ROOT] link with SSL support [default=auto]
@@ -62,17 +62,17 @@
AC_ARG_ENABLE(opie,
[ --disable-opie disable support for opie or s/key FTP login],
@@ -374,7 +374,7 @@
dnl AC_MSG_RESULT doesn't look right here, but I'm not sure what
dnl to use instead.
- AC_MSG_RESULT("Compiling in support for SSL in $ssl_root")
+ AC_MSG_RESULT([Compiling in support for SSL in $ssl_root])
- AC_DEFINE(HAVE_SSL)
+ AC_DEFINE(HAVE_SSL,,[SSL support])
AC_SUBST(SSL_INCLUDES)
+AC_DEFINE(HAVE_MD5,,[Have MD5])
AC_SUBST(MD5_OBJ)
- dnl
-@@ -452,7 +452,7 @@
+ dnl **********************************************************************
+@@ -451,7 +451,7 @@
+ AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]),
+ [case "${enable_ipv6}" in
+ no)
+- AC_MSG_NOTICE([Disabling IPv6 at user request])
++ [AC_MSG_NOTICE([Disabling IPv6 at user request])]
+ ipv6=no
+ ;;
+ *)
+@@ -522,7 +522,7 @@
dnl new language was added.
dnl internationalization macros
dnl
dnl Find makeinfo. If makeinfo is not found, look for Emacs. If
-diff -Nur wget-1.8.2.orig/src/main.c wget-1.8.2/src/main.c
---- wget-1.8.2.orig/src/main.c Wed Jun 5 20:39:23 2002
-+++ wget-1.8.2/src/main.c Wed Jun 5 20:51:34 2002
+diff -urN wget-1.9-beta3.org/configure.in~ wget-1.9-beta3/configure.in~
+--- wget-1.9-beta3.org/configure.in~ 1970-01-01 01:00:00.000000000 +0100
++++ wget-1.9-beta3/configure.in~ 2003-10-03 12:14:24.000000000 +0200
+@@ -0,0 +1,560 @@
++dnl Template file for GNU Autoconf
++dnl Copyright (C) 1995, 1996, 1997, 2001 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 (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, write to the Free Software
++dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++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
++dnl Process this file with autoconf to produce a configure script.
++dnl
++
++AC_INIT(src/version.c)
++AC_PREREQ(2.50)
++AC_CONFIG_HEADER(src/config.h)
++
++dnl
++dnl What version of Wget are we building?
++dnl
++VERSION=`sed -e 's/^.*"\(.*\)";$/\1/' ${srcdir}/src/version.c`
++echo "configuring for GNU Wget $VERSION"
++AC_SUBST(VERSION)
++PACKAGE=wget
++AC_SUBST(PACKAGE)
++
++dnl
++dnl Get cannonical host
++dnl
++AC_CANONICAL_HOST
++AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os", [OS type])
++
++dnl
++dnl Process features.
++dnl
++AC_ARG_WITH(socks,
++[ --with-socks use the socks library],
++[AC_DEFINE(HAVE_SOCKS,,[Use the socks library])])
++
++AC_ARG_WITH(ssl,
++[[ --with-ssl[=SSL-ROOT] link with SSL support [default=auto]
++ --without-ssl disable SSL autodetection]])
++
++AC_ARG_ENABLE(opie,
++[ --disable-opie disable support for opie or s/key FTP login],
++USE_OPIE=$enableval, USE_OPIE=yes)
++test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE,,[FTP opie or s/key login support])
++
++AC_ARG_ENABLE(digest,
++[ --disable-digest disable support for HTTP digest authorization],
++USE_DIGEST=$enableval, USE_DIGEST=yes)
++test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST,,[HTTP digest authorization support])
++
++AC_ARG_ENABLE(debug,
++[ --disable-debug disable support for debugging output],
++DEBUG=$enableval, DEBUG=yes)
++test x"${DEBUG}" = xyes && AC_DEFINE(DEBUG,,[Support for debugging output])
++
++wget_need_md5=no
++
++case "${USE_OPIE}${USE_DIGEST}" in
++*yes*)
++ wget_need_md5=yes
++esac
++if test x"$USE_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
++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
++
++dnl
++dnl if the user hasn't specified CFLAGS, then
++dnl if compiler is gcc, then use -O2 and some warning flags
++dnl else use os-specific flags or -O
++dnl
++if test -n "$auto_cflags"; then
++ if test -n "$GCC"; then
++ CFLAGS="$CFLAGS -O2 -Wall -Wno-implicit"
++ else
++ case "$host_os" in
++ *hpux*) CFLAGS="$CFLAGS +O3" ;;
++ *ultrix* | *osf*) CFLAGS="$CFLAGS -O -Olimit 2000" ;;
++ *) CFLAGS="$CFLAGS -O" ;;
++ esac
++ fi
++fi
++
++dnl
++dnl Handle AIX
++dnl
++AC_AIX
++
++dnl
++dnl Configure our included libtool and make sure it's regenerated when needed
++dnl
++AC_PROG_LIBTOOL
++AC_SUBST(LIBTOOL_DEPS)
++
++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 Check if we can handle prototypes.
++dnl
++AM_C_PROTOTYPES
++
++dnl
++dnl Checks for typedefs, structures, and compiler characteristics.
++dnl
++AC_C_CONST
++AC_C_INLINE
++AC_TYPE_SIZE_T
++AC_TYPE_PID_T
++AC_C_BIGENDIAN
++
++# Check size of long.
++AC_CHECK_SIZEOF(long)
++AC_CHECK_SIZEOF(long long)
++
++dnl
++dnl Checks for headers
++dnl
++AC_CHECK_HEADERS(string.h stdarg.h unistd.h sys/time.h utime.h sys/utime.h pwd.h)
++AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h sys/utsname.h)
++AC_CHECK_HEADERS(signal.h setjmp.h)
++AC_HEADER_TIME
++
++dnl
++dnl Return type of signal-handlers
++dnl
++AC_TYPE_SIGNAL
++
++dnl
++dnl Check for struct utimbuf
++WGET_STRUCT_UTIMBUF
++
++dnl
++dnl Checks for library functions.
++dnl
++AC_FUNC_ALLOCA
++AC_FUNC_MMAP
++AC_CHECK_FUNCS(strdup strstr strcasecmp strncasecmp strpbrk memmove)
++AC_CHECK_FUNCS(gettimeofday mktime strptime strerror snprintf vsnprintf)
++AC_CHECK_FUNCS(select sigblock sigsetjmp signal symlink access isatty)
++AC_CHECK_FUNCS(uname gethostname usleep)
++
++dnl
++dnl Check if we need to compile in getopt.c.
++dnl
++AC_CHECK_FUNC(getopt_long, [], [
++ GETOPT_OBJ='getopt$o'
++])
++AC_SUBST(GETOPT_OBJ)
++
++dnl
++dnl Checks for libraries.
++dnl
++
++dnl On Solaris, -lnsl is needed to use gethostbyname. On "NCR MP-RAS
++dnl 3.0", however, gethostbyname is in libc, but -lnsl is still needed
++dnl to use -lsocket, as well as for functions such as inet_ntoa. We
++dnl look for such known offenders and if one of them is not found, we
++dnl check if -lnsl is needed.
++
++wget_check_in_nsl=NONE
++AC_CHECK_FUNCS(gethostbyname, [], [
++ wget_check_in_nsl=gethostbyname
++])
++AC_CHECK_FUNCS(inet_ntoa, [], [
++ wget_check_in_nsl=inet_ntoa
++])
++if test $wget_check_in_nsl != NONE; then
++ AC_CHECK_LIB(nsl, $wget_check_in_nsl)
++fi
++
++AC_CHECK_LIB(socket, socket)
++
++dnl #### This appears to be deficient with later versions of SOCKS.
++if test "x${with_socks}" = xyes
++then
++ AC_CHECK_LIB(resolv, main)
++ AC_CHECK_LIB(socks, Rconnect)
++fi
++
++dnl $with_ssl can be one of:
++dnl - empty string or "auto", meaning autodetect SSL and use it if found.
++dnl - "yes", meaning link with SSL or bail out.
++dnl - "no", meaning don't link with SSL.
++dnl - anything else, meaning use that as the SSL root, and bail out
++dnl if it fails.
++
++if test x"$with_ssl" = x; then
++ dnl Canonicalize unspecified with-ssl setting to "auto". This
++ dnl implements the "auto-detect by default" feature. If you want to
++ dnl change this to "ignore SSL by default", change "auto" to "no".
++ with_ssl=auto
++fi
++
++dnl Detection of OpenSSL is much hairier than the detection of other
++dnl libraries because OpenSSL can be compiled as a third-party
++dnl library, which means it will not be found without additional
++dnl linker magic. It would be really nice to rework this check into
++dnl an AC_DEFUN so that we can reuse it for other third-party
++dnl libraries.
++
++if test x"$with_ssl" != x"no"; then
++
++ wget_force_ssl=no
++ if test x"$with_ssl" = x"yes"; then
++ wget_force_ssl=yes
++ fi
++
++ if test x"$with_ssl" = x"yes" || test x"$with_ssl" = x"auto"; then
++ dnl OpenSSL's root was not specified, so we have to guess. First
++ dnl try the system default location, then "/usr/local/ssl" (where
++ dnl OpenSSL installs by default), then "/usr/local" (traditional
++ dnl choice for installation root), then "/opt".
++ ssl_all_roots="system-default /usr/local/ssl /usr/local /opt"
++ else
++ dnl Root has been specified by the user.
++ ssl_all_roots=$with_ssl
++ wget_force_ssl=yes
++ fi
++
++ wget_save_CC=$CC
++ wget_save_LIBS=$LIBS
++ wget_save_LDFLAGS=$LDFLAGS
++ wget_save_CPPFLAGS=$CPPFLAGS
++
++ dnl Use libtool for OpenSSL tests so we can specify "-R<rpath>"
++ dnl without having to know how the linker handles it.
++ CC="$SHELL ./libtool $CC"
++
++ dnl Unfortunately, as of this writing (OpenSSL 0.9.6), the libcrypto
++ dnl shared library doesn't record its dependency on libdl, so we
++ dnl need to check for it ourselves so we won't fail to link due to a
++ dnl lack of -ldl. Most OSes use dlopen(), but HP-UX uses
++ dnl shl_load().
++ AC_CHECK_LIB(dl,dlopen)
++ AC_CHECK_LIB(dl,shl_load)
++
++ ssl_success=no
++
++ dnl Now try to find SSL libraries in each of the likely SSL roots.
++ for ssl_root in $ssl_all_roots
++ do
++ if test x"$ssl_root" = x"system-default"; then
++ dnl Try the default include and library locations.
++ SSL_INCLUDES=
++ else
++ dnl Try this specific root.
++ SSL_INCLUDES=-I$ssl_root/include
++ dnl It's OK to use -R directly because libtool will
++ dnl interpret it for us.
++ LDFLAGS="-L$ssl_root/lib -R$ssl_root/lib $wget_save_LDFLAGS"
++ fi
++
++ AC_MSG_RESULT([Looking for SSL libraries in $ssl_root])
++
++ dnl Check whether the compiler can find the include files. On
++ dnl some systems Gcc finds libraries in /usr/local/lib, but fails
++ dnl to find the includes in /usr/local/include.
++
++ ssl_found_includes=no
++ CPPFLAGS="$SSL_INCLUDES $wget_save_CPPFLAGS"
++
++ AC_MSG_CHECKING([for includes])
++
++ AC_TRY_CPP([#include <openssl/ssl.h>
++#include <openssl/rsa.h>
++],
++ AC_MSG_RESULT(found); ssl_found_includes=yes,
++ AC_MSG_RESULT([not found])
++ )
++
++ if test x"$ssl_found_includes" = xno; then
++ continue
++ fi
++
++ ssl_link_failure=no
++
++ dnl Make sure that the checks don't run afoul of the cache. It
++ dnl would be nicer to temporarily turn off the cache, but
++ dnl apparently Autoconf doesn't allow that.
++
++ unset ac_cv_lib_crypto_RSA_new
++ unset ac_cv_lib_ssl_SSL_new
++
++ dnl These checks need to be in this order, or you'll get a link
++ dnl failure if you use a static libcrypto.a and libssl.a rather
++ dnl than shared libraries.
++
++ AC_CHECK_LIB(crypto, RSA_new, , ssl_link_failure=yes)
++ AC_CHECK_LIB(ssl, SSL_new, , ssl_link_failure=yes)
++
++ if test x"$ssl_link_failure" = xyes; then
++ dnl One or both libs failed to link.
++ continue
++ fi
++
++ dnl The libraries link. But we still need to check if the program
++ dnl linked with those libraries under these settings with run. On
++ dnl some systems (Solaris), Gcc adds -L/usr/local/lib to the
++ dnl linking line, but fails to add -R/usr/local/lib, thus creating
++ dnl executables that link, but fail to run.
++
++ dnl If we are cross-compiling, just assume that working linkage
++ dnl implies working executable.
++
++ ssl_run_failure=no
++
++ AC_MSG_CHECKING([whether SSL libs are resolved at runtime])
++ AC_TRY_RUN([
++int RSA_new();
++int SSL_new();
++main(){return 0;}
++],
++ AC_MSG_RESULT(yes),
++ AC_MSG_RESULT(no); ssl_run_failure=yes,
++ AC_MSG_RESULT(cross)
++ )
++
++ if test x"$ssl_run_failure" = xno; then
++ ssl_success=yes
++ break
++ fi
++ done
++
++ if test x"$ssl_success" = xyes; then
++ dnl AC_MSG_RESULT doesn't look right here, but I'm not sure what
++ dnl to use instead.
++ AC_MSG_RESULT([Compiling in support for SSL in $ssl_root])
++ AC_DEFINE(HAVE_SSL,,[SSL support])
++ AC_SUBST(SSL_INCLUDES)
++ SSL_OBJ='gen_sslfunc$o'
++ AC_SUBST(SSL_OBJ)
++ else
++ LDFLAGS=$wget_save_LDFLAGS
++ LIBS=$wget_save_LIBS
++
++ dnl If linking with SSL was forced rather than auto-detected, then
++ dnl bail out if SSL failed.
++ if test x"$wget_force_ssl" = x"yes"; then
++ exec >&2
++ echo "ERROR: Failed to find OpenSSL libraries."
++ exit 2
++ fi
++ fi
++
++ dnl Restore the compiler setting.
++ CC=$wget_save_CC
++
++ dnl Restore the CPPFLAGS. Do this regardless of whether linking
++ dnl with SSL succeeded -- SSL includes will be handled using
++ dnl @SSL_INCLUDES@.
++ CPPFLAGS=$wget_save_CPPFLAGS
++fi
++
++dnl
++dnl Find an md5 implementation.
++dnl
++
++if test x"$wget_need_md5" = xyes
++then
++ MD5_OBJ='gen-md5$o'
++
++ 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. md5_calc is, hopefully,
++ dnl specific to the Solaris MD5 library.
++ if test x"$found_md5" = xno; then
++ AC_CHECK_LIB(md5, md5_calc, [
++ AC_DEFINE(HAVE_SOLARIS_MD5,,[Use Solaris MD5])
++ LIBS="-lmd5 $LIBS"
++ found_md5=yes
++ ])
++ 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"$ssl_success" = xyes; then
++ AC_DEFINE(HAVE_OPENSSL_MD5,,[Use OpenSSL MD5])
++ found_md5=yes
++ 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,,[Use builtin MD5])
++ found_md5=yes
++ MD5_OBJ="$MD5_OBJ gnu-md5\$o"
++ fi
++fi
++AC_DEFINE(HAVE_MD5,,[Have MD5])
++AC_SUBST(MD5_OBJ)
++
++dnl **********************************************************************
++dnl Checks for IPv6
++dnl **********************************************************************
++
++ipv6=
++check_for_ipv6=no
++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])
++ ipv6=no
++ ;;
++ *)
++ ipv6=yes
++ ;;
++ esac],
++ [check_for_ipv6=no]
++)
++
++if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
++ AC_CHECK_FUNCS(getaddrinfo,[
++ GETADDRINFO_AI_ADDRCONFIG(
++ AC_DEFINE(
++ [HAVE_GETADDRINFO_AI_ADDRCONFIG], 1,
++ [Define if the system headers support the AI_ADDRCONFIG flag.]
++ )
++ )
++ GETADDRINFO_AI_V4MAPPED(
++ AC_DEFINE(
++ [HAVE_GETADDRINFO_AI_V4MAPPED], 1,
++ [Define if the system headers support the AI_V4MAPPED flag.]
++ )
++ )
++ GETADDRINFO_AI_ALL(
++ AC_DEFINE(
++ [HAVE_GETADDRINFO_AI_ALL], 1,
++ [Define if the system headers support the AI_ALL flag.]
++ )
++ )
++ ],[
++ AC_MSG_NOTICE([Disabling IPv6 support: your system does not support getaddrinfo(3)])
++ ipv6=no
++ ])
++fi
++
++if test "X$ipv6" = "Xyes" || test "X$check_for_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" || test "X$check_for_ipv6" = "Xyes"; then
++ TYPE_STRUCT_SOCKADDR_IN6([
++ ipv6=yes
++ ],[
++ AC_MSG_NOTICE([Disabling IPv6 support: your system does not support 'struct sockaddr_in6'])
++ ipv6=no
++ ])
++ if test "X$ipv6" = "Xyes"; then
++ MEMBER_SIN6_SCOPE_ID
++ fi
++fi
++
++if test "X$ipv6" = "Xyes"; then
++ AC_DEFINE([ENABLE_IPV6], 1, [Define if IPv6 support is enabled.])
++fi
++
++
++dnl
++dnl Set of available languages.
++dnl
++ALL_LINGUAS=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')`
++
++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 internationalization macros
++AM_GNU_GETTEXT
++
++dnl
++dnl Find makeinfo. If makeinfo is not found, look for Emacs. If
++dnl Emacs cannot be found, look for XEmacs.
++dnl
++
++AC_CHECK_PROGS(MAKEINFO, makeinfo emacs xemacs)
++
++case "${MAKEINFO}" in
++ *makeinfo) MAKEINFO="${MAKEINFO} \$(srcdir)/wget.texi" ;;
++ *emacs | *xemacs) MAKEINFO="${MAKEINFO} -batch -q -no-site-file -eval '(find-file \"\$(srcdir)/wget.texi\")' -l texinfmt -f texinfo-format-buffer -f save-buffer" ;;
++ *) MAKEINFO="makeinfo \$(srcdir)/wget.texi" ;;
++esac
++
++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_OUTPUT([Makefile src/Makefile doc/Makefile util/Makefile po/Makefile.in
++ windows/Makefile],
++[WGET_PROCESS_PO
++test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])
+diff -urN wget-1.9-beta3.org/src/main.c wget-1.9-beta3/src/main.c
+--- wget-1.9-beta3.org/src/main.c 2003-10-03 12:07:14.000000000 +0200
++++ wget-1.9-beta3/src/main.c 2003-10-03 12:07:21.000000000 +0200
@@ -44,11 +44,11 @@
#ifdef HAVE_SIGNAL_H
# include <signal.h>
+#endif /* ENABLE_NLS */
#include <errno.h>
- #define OPTIONS_DEFINED_HERE /* for options.h */
-@@ -97,9 +97,9 @@
+ #include "wget.h"
+@@ -98,9 +98,9 @@
static void
i18n_initialize (void)
{
/* Set the current locale. */
/* Here we use LC_MESSAGES instead of LC_ALL, for two reasons.
First, message catalogs are all of I18N Wget uses anyway.
-@@ -116,7 +116,7 @@
+@@ -117,7 +117,7 @@
/* Set the text message domain. */
bindtextdomain ("wget", LOCALEDIR);
textdomain ("wget");
}
\f
/* Print the usage message. */
-diff -Nur wget-1.8.2.orig/src/wget.h wget-1.8.2/src/wget.h
---- wget-1.8.2.orig/src/wget.h Sat May 18 05:14:49 2002
-+++ wget-1.8.2/src/wget.h Wed Jun 5 20:50:56 2002
+diff -urN wget-1.9-beta3.org/src/wget.h wget-1.9-beta3/src/wget.h
+--- wget-1.9-beta3.org/src/wget.h 2003-10-03 12:07:14.000000000 +0200
++++ wget-1.9-beta3/src/wget.h 2003-10-03 12:07:21.000000000 +0200
@@ -53,14 +53,12 @@
/* `gettext (FOO)' is long to write, so we use `_(FOO)'. If NLS is
-#endif /* not HAVE_NLS */
+#endif /* not ENABLE_NLS */
- /* I18N NOTE: You will notice that none of the DEBUG messages are
- marked as translatable. This is intentional, for a few reasons:
+ /* No-op version of gettext, used for constant strings. */
+ #define N_(string) (string)
projects / packages / wget.git / commitdiff