1 diff -Nur wget-1.8.2.orig/acinclude.m4 wget-1.8.2/acinclude.m4
2 --- wget-1.8.2.orig/acinclude.m4 Thu Jan 1 01:00:00 1970
3 +++ wget-1.8.2/acinclude.m4 Wed Jun 5 20:45:08 2002
5 +AC_DEFUN(WGET_STRUCT_UTIMBUF,
6 +[AC_MSG_CHECKING(for struct utimbuf)
7 +if test x"$ac_cv_header_utime_h" = xyes; then
8 + AC_EGREP_CPP([struct[ ]+utimbuf],
9 + [#include <utime.h>],
10 + [AC_DEFINE(HAVE_STRUCT_UTIMBUF,,[Have struct utimbuf])
11 + AC_MSG_RESULT(yes)],
16 diff -Nur wget-1.8.2.orig/configure.in wget-1.8.2/configure.in
17 --- wget-1.8.2.orig/configure.in Sat May 18 05:05:11 2002
18 +++ wget-1.8.2/configure.in Wed Jun 5 20:44:55 2002
20 dnl Get cannonical host
23 -AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os")
24 +AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os", [OS type])
30 [ --with-socks use the socks library],
31 -[AC_DEFINE(HAVE_SOCKS)])
32 +[AC_DEFINE(HAVE_SOCKS,,[Use the socks library])])
35 [ --with-ssl[=SSL-ROOT] link with SSL support [default=auto]
38 [ --disable-opie disable support for opie or s/key FTP login],
39 USE_OPIE=$enableval, USE_OPIE=yes)
40 -test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE)
41 +test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE,,[FTP opie or s/key login support])
44 [ --disable-digest disable support for HTTP digest authorization],
45 USE_DIGEST=$enableval, USE_DIGEST=yes)
46 -test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST)
47 +test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST,,[HTTP digest authorization support])
50 [ --disable-debug disable support for debugging output],
51 DEBUG=$enableval, DEBUG=yes)
52 -test x"${DEBUG}" = xyes && AC_DEFINE(DEBUG)
53 +test x"${DEBUG}" = xyes && AC_DEFINE(DEBUG,,[Support for debugging output])
58 dnl AC_MSG_RESULT doesn't look right here, but I'm not sure what
60 AC_MSG_RESULT("Compiling in support for SSL in $ssl_root")
62 + AC_DEFINE(HAVE_SSL,,[SSL support])
63 AC_SUBST(SSL_INCLUDES)
64 SSL_OBJ='gen_sslfunc$o'
67 dnl specific to the Solaris MD5 library.
68 if test x"$found_md5" = xno; then
69 AC_CHECK_LIB(md5, md5_calc, [
70 - AC_DEFINE(HAVE_SOLARIS_MD5)
71 + AC_DEFINE(HAVE_SOLARIS_MD5,,[Use Solaris MD5])
77 if test x"$found_md5" = xno; then
78 if test x"$ssl_success" = xyes; then
79 - AC_DEFINE(HAVE_OPENSSL_MD5)
80 + AC_DEFINE(HAVE_OPENSSL_MD5,,[Use OpenSSL MD5])
85 dnl If none of the above worked, use the one we ship with Wget.
86 if test x"$found_md5" = xno; then
87 - AC_DEFINE(HAVE_BUILTIN_MD5)
88 + AC_DEFINE(HAVE_BUILTIN_MD5,,[Use builtin MD5])
90 MD5_OBJ="$MD5_OBJ gnu-md5\$o"
94 +AC_DEFINE(HAVE_MD5,,[Have MD5])
99 dnl new language was added.
101 dnl internationalization macros
106 dnl Find makeinfo. If makeinfo is not found, look for Emacs. If
107 diff -Nur wget-1.8.2.orig/src/main.c wget-1.8.2/src/main.c
108 --- wget-1.8.2.orig/src/main.c Wed Jun 5 20:39:23 2002
109 +++ wget-1.8.2/src/main.c Wed Jun 5 20:51:34 2002
118 #endif /* HAVE_LOCALE_H */
119 -#endif /* HAVE_NLS */
120 +#endif /* ENABLE_NLS */
123 #define OPTIONS_DEFINED_HERE /* for options.h */
126 i18n_initialize (void)
128 - /* If HAVE_NLS is defined, assume the existence of the three
129 + /* If ENABLE_NLS is defined, assume the existence of the three
130 functions invoked here. */
133 /* Set the current locale. */
134 /* Here we use LC_MESSAGES instead of LC_ALL, for two reasons.
135 First, message catalogs are all of I18N Wget uses anyway.
137 /* Set the text message domain. */
138 bindtextdomain ("wget", LOCALEDIR);
140 -#endif /* HAVE_NLS */
141 +#endif /* ENABLE_NLS */
144 /* Print the usage message. */
145 diff -Nur wget-1.8.2.orig/src/wget.h wget-1.8.2/src/wget.h
146 --- wget-1.8.2.orig/src/wget.h Sat May 18 05:14:49 2002
147 +++ wget-1.8.2/src/wget.h Wed Jun 5 20:50:56 2002
150 /* `gettext (FOO)' is long to write, so we use `_(FOO)'. If NLS is
151 unavailable, _(STRING) simply returns STRING. */
154 # define _(string) gettext (string)
155 -# ifdef HAVE_LIBINTL_H
156 # include <libintl.h>
157 -# endif /* HAVE_LIBINTL_H */
158 -#else /* not HAVE_NLS */
159 +#else /* not ENABLE_NLS */
160 # define _(string) string
161 -#endif /* not HAVE_NLS */
162 +#endif /* not ENABLE_NLS */
164 /* I18N NOTE: You will notice that none of the DEBUG messages are
165 marked as translatable. This is intentional, for a few reasons: