1 --- wget-1.9.1/configure.in.orig 2003-11-08 20:15:35.000000000 +0100
2 +++ wget-1.9.1/configure.in 2003-11-16 11:46:45.947950144 +0100
4 dnl Get cannonical host
7 -AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os")
8 +AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os", [OS type])
14 [ --with-socks use the socks library],
15 -[AC_DEFINE(HAVE_SOCKS)])
16 +[AC_DEFINE(HAVE_SOCKS,,[Use the socks library])])
19 [[ --with-ssl[=SSL-ROOT] link with SSL support [default=auto]
22 [ --disable-opie disable support for opie or s/key FTP login],
23 USE_OPIE=$enableval, USE_OPIE=yes)
24 -test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE)
25 +test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE,,[FTP opie or s/key login support])
28 [ --disable-digest disable support for HTTP digest authorization],
29 USE_DIGEST=$enableval, USE_DIGEST=yes)
30 -test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST)
31 +test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST,,[HTTP digest authorization support])
34 [ --disable-debug disable support for debugging output],
35 ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes)
36 -test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG)
37 +test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG,,[Support for debugging output])
42 dnl AC_MSG_RESULT doesn't look right here, but I'm not sure what
44 AC_MSG_RESULT([Compiling in support for SSL in $ssl_root])
46 + AC_DEFINE(HAVE_SSL,,[SSL support])
47 AC_SUBST(SSL_INCLUDES)
48 SSL_OBJ='gen_sslfunc$o'
51 AC_COMPILE_IFELSE([#include <md5.h>
54 - AC_DEFINE(HAVE_SOLARIS_MD5)
55 + AC_DEFINE(HAVE_SOLARIS_MD5,,[Use Solaris MD5])
58 AC_MSG_NOTICE([using the Solaris MD5 implementation])
61 if test x"$found_md5" = xno; then
62 if test x"$ssl_success" = xyes; then
63 - AC_DEFINE(HAVE_OPENSSL_MD5)
64 + AC_DEFINE(HAVE_OPENSSL_MD5,,[Use OpenSSL MD5])
66 AC_MSG_NOTICE([using the OpenSSL MD5 implementation])
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])
74 MD5_OBJ="$MD5_OBJ gnu-md5\$o"
76 AC_MSG_NOTICE([using the GNU MD5 implementation])
80 +AC_DEFINE(HAVE_MD5,,[Have MD5])
83 dnl **********************************************************************
85 dnl new language was added.
87 dnl internationalization macros
92 dnl Find makeinfo. If makeinfo is not found, look for Emacs. If
96 AC_OUTPUT([Makefile src/Makefile doc/Makefile util/Makefile po/Makefile.in
99 -test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])
101 diff -urN wget-1.9-b5.org/Makefile.in wget-1.9-b5/Makefile.in
102 --- wget-1.9-b5.org/Makefile.in 2003-10-12 23:55:54.000000000 +0200
103 +++ wget-1.9-b5/Makefile.in 2003-10-13 00:29:14.000000000 +0200
105 infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
107 # subdirectories in the distribution
108 -SUBDIRS = src doc po util windows
109 +SUBDIRS = src doc intl po util windows
112 all: libtool src/config.h Makefile $(SUBDIRS)
115 # Install `.mo' files
117 - cd po && $(MAKE) $(MAKEDEFS) $@
118 + cd po && $(MAKE) $(MAKEDEFS) install
120 # Regenerate libtool if ltconfig and/or ltmain are updated
121 libtool: $(LIBTOOL_DEPS)
122 diff -urN wget-1.9-b5.org/src/main.c wget-1.9-b5/src/main.c
123 --- wget-1.9-b5.org/src/main.c 2003-10-12 23:55:54.000000000 +0200
124 +++ wget-1.9-b5/src/main.c 2003-10-13 00:14:16.000000000 +0200
133 #endif /* HAVE_LOCALE_H */
134 -#endif /* HAVE_NLS */
135 +#endif /* ENABLE_NLS */
141 i18n_initialize (void)
143 - /* If HAVE_NLS is defined, assume the existence of the three
144 + /* If ENABLE_NLS is defined, assume the existence of the three
145 functions invoked here. */
148 /* Set the current locale. */
149 /* Here we use LC_MESSAGES instead of LC_ALL, for two reasons.
150 First, message catalogs are all of I18N Wget uses anyway.
152 /* Set the text message domain. */
153 bindtextdomain ("wget", LOCALEDIR);
155 -#endif /* HAVE_NLS */
156 +#endif /* ENABLE_NLS */
159 /* Print the usage message. */
160 diff -urN wget-1.9-b5.org/src/wget.h wget-1.9-b5/src/wget.h
161 --- wget-1.9-b5.org/src/wget.h 2003-10-12 23:55:54.000000000 +0200
162 +++ wget-1.9-b5/src/wget.h 2003-10-13 00:14:16.000000000 +0200
165 /* `gettext (FOO)' is long to write, so we use `_(FOO)'. If NLS is
166 unavailable, _(STRING) simply returns STRING. */
169 # define _(string) gettext (string)
170 -# ifdef HAVE_LIBINTL_H
171 # include <libintl.h>
172 -# endif /* HAVE_LIBINTL_H */
173 -#else /* not HAVE_NLS */
174 +#else /* not ENABLE_NLS */
175 # define _(string) string
176 -#endif /* not HAVE_NLS */
177 +#endif /* not ENABLE_NLS */
179 /* No-op version of gettext, used for constant strings. */
180 #define N_(string) (string)