1 diff -urN wget-1.9-beta3.org/configure.in wget-1.9-beta3/configure.in
2 --- wget-1.9-beta3.org/configure.in 2003-10-03 12:07:14.000000000 +0200
3 +++ wget-1.9-beta3/configure.in 2003-10-03 12:15:57.000000000 +0200
5 dnl Get cannonical host
8 -AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os")
9 +AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os", [OS type])
15 [ --with-socks use the socks library],
16 -[AC_DEFINE(HAVE_SOCKS)])
17 +[AC_DEFINE(HAVE_SOCKS,,[Use the socks library])])
20 [[ --with-ssl[=SSL-ROOT] link with SSL support [default=auto]
23 [ --disable-opie disable support for opie or s/key FTP login],
24 USE_OPIE=$enableval, USE_OPIE=yes)
25 -test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE)
26 +test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE,,[FTP opie or s/key login support])
29 [ --disable-digest disable support for HTTP digest authorization],
30 USE_DIGEST=$enableval, USE_DIGEST=yes)
31 -test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST)
32 +test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST,,[HTTP digest authorization support])
35 [ --disable-debug disable support for debugging output],
36 ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes)
37 -test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG)
38 +test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG,,[Support for debugging output])
43 dnl AC_MSG_RESULT doesn't look right here, but I'm not sure what
45 AC_MSG_RESULT([Compiling in support for SSL in $ssl_root])
47 + AC_DEFINE(HAVE_SSL,,[SSL support])
48 AC_SUBST(SSL_INCLUDES)
49 SSL_OBJ='gen_sslfunc$o'
52 dnl specific to the Solaris MD5 library.
53 if test x"$found_md5" = xno; then
54 AC_CHECK_LIB(md5, md5_calc, [
55 - AC_DEFINE(HAVE_SOLARIS_MD5)
56 + AC_DEFINE(HAVE_SOLARIS_MD5,,[Use Solaris MD5])
62 if test x"$found_md5" = xno; then
63 if test x"$ssl_success" = xyes; then
64 - AC_DEFINE(HAVE_OPENSSL_MD5)
65 + AC_DEFINE(HAVE_OPENSSL_MD5,,[Use OpenSSL MD5])
70 dnl If none of the above worked, use the one we ship with Wget.
71 if test x"$found_md5" = xno; then
72 - AC_DEFINE(HAVE_BUILTIN_MD5)
73 + AC_DEFINE(HAVE_BUILTIN_MD5,,[Use builtin MD5])
75 MD5_OBJ="$MD5_OBJ gnu-md5\$o"
79 +AC_DEFINE(HAVE_MD5,,[Have MD5])
82 dnl **********************************************************************
84 dnl new language was added.
86 dnl internationalization macros
91 dnl Find makeinfo. If makeinfo is not found, look for Emacs. If
92 diff -urN wget-1.9-beta3.org/src/main.c wget-1.9-beta3/src/main.c
93 --- wget-1.9-beta3.org/src/main.c 2003-10-03 12:07:14.000000000 +0200
94 +++ wget-1.9-beta3/src/main.c 2003-10-03 12:07:21.000000000 +0200
103 #endif /* HAVE_LOCALE_H */
104 -#endif /* HAVE_NLS */
105 +#endif /* ENABLE_NLS */
111 i18n_initialize (void)
113 - /* If HAVE_NLS is defined, assume the existence of the three
114 + /* If ENABLE_NLS is defined, assume the existence of the three
115 functions invoked here. */
118 /* Set the current locale. */
119 /* Here we use LC_MESSAGES instead of LC_ALL, for two reasons.
120 First, message catalogs are all of I18N Wget uses anyway.
122 /* Set the text message domain. */
123 bindtextdomain ("wget", LOCALEDIR);
125 -#endif /* HAVE_NLS */
126 +#endif /* ENABLE_NLS */
129 /* Print the usage message. */
130 diff -urN wget-1.9-beta3.org/src/wget.h wget-1.9-beta3/src/wget.h
131 --- wget-1.9-beta3.org/src/wget.h 2003-10-03 12:07:14.000000000 +0200
132 +++ wget-1.9-beta3/src/wget.h 2003-10-03 12:07:21.000000000 +0200
135 /* `gettext (FOO)' is long to write, so we use `_(FOO)'. If NLS is
136 unavailable, _(STRING) simply returns STRING. */
139 # define _(string) gettext (string)
140 -# ifdef HAVE_LIBINTL_H
141 # include <libintl.h>
142 -# endif /* HAVE_LIBINTL_H */
143 -#else /* not HAVE_NLS */
144 +#else /* not ENABLE_NLS */
145 # define _(string) string
146 -#endif /* not HAVE_NLS */
147 +#endif /* not ENABLE_NLS */
149 /* No-op version of gettext, used for constant strings. */
150 #define N_(string) (string)