]>
Commit | Line | Data |
---|---|---|
48ea1035 AM |
1 | diff -urN wget-1.9-b5.org/configure.in wget-1.9-b5/configure.in |
2 | --- wget-1.9-b5.org/configure.in 2003-10-12 23:55:54.000000000 +0200 | |
3 | +++ wget-1.9-b5/configure.in 2003-10-13 00:24:45.000000000 +0200 | |
65f0aada JB |
4 | @@ -46,14 +46,14 @@ |
5 | dnl Get cannonical host | |
6 | dnl | |
7 | AC_CANONICAL_HOST | |
8 | -AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os") | |
9 | +AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os", [OS type]) | |
10 | ||
11 | dnl | |
12 | dnl Process features. | |
13 | dnl | |
14 | AC_ARG_WITH(socks, | |
15 | [ --with-socks use the socks library], | |
16 | -[AC_DEFINE(HAVE_SOCKS)]) | |
17 | +[AC_DEFINE(HAVE_SOCKS,,[Use the socks library])]) | |
18 | ||
19 | AC_ARG_WITH(ssl, | |
72f0b3b2 | 20 | [[ --with-ssl[=SSL-ROOT] link with SSL support [default=auto] |
65f0aada JB |
21 | @@ -62,17 +62,17 @@ |
22 | AC_ARG_ENABLE(opie, | |
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]) | |
27 | ||
28 | AC_ARG_ENABLE(digest, | |
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]) | |
33 | ||
34 | AC_ARG_ENABLE(debug, | |
35 | [ --disable-debug disable support for debugging output], | |
db7d71cc AM |
36 | ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes) |
37 | -test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG) | |
9349c7c4 | 38 | +test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG,,[Support for debugging output]) |
65f0aada JB |
39 | |
40 | wget_need_md5=no | |
41 | ||
48ea1035 | 42 | @@ -382,7 +382,7 @@ |
65f0aada JB |
43 | dnl AC_MSG_RESULT doesn't look right here, but I'm not sure what |
44 | dnl to use instead. | |
72f0b3b2 | 45 | AC_MSG_RESULT([Compiling in support for SSL in $ssl_root]) |
65f0aada JB |
46 | - AC_DEFINE(HAVE_SSL) |
47 | + AC_DEFINE(HAVE_SSL,,[SSL support]) | |
48 | AC_SUBST(SSL_INCLUDES) | |
49 | SSL_OBJ='gen_sslfunc$o' | |
50 | AC_SUBST(SSL_OBJ) | |
48ea1035 | 51 | @@ -424,7 +424,7 @@ |
65f0aada JB |
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]) | |
57 | LIBS="-lmd5 $LIBS" | |
58 | found_md5=yes | |
59 | ]) | |
48ea1035 | 60 | @@ -434,19 +434,19 @@ |
65f0aada JB |
61 | dnl implementation. |
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]) | |
66 | found_md5=yes | |
67 | fi | |
68 | fi | |
69 | ||
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 | found_md5=yes | |
75 | MD5_OBJ="$MD5_OBJ gnu-md5\$o" | |
76 | fi | |
77 | fi | |
78 | -AC_DEFINE(HAVE_MD5) | |
79 | +AC_DEFINE(HAVE_MD5,,[Have MD5]) | |
80 | AC_SUBST(MD5_OBJ) | |
81 | ||
72f0b3b2 | 82 | dnl ********************************************************************** |
48ea1035 | 83 | @@ -530,7 +530,7 @@ |
65f0aada JB |
84 | dnl new language was added. |
85 | ||
86 | dnl internationalization macros | |
87 | -WGET_WITH_NLS | |
88 | +AM_GNU_GETTEXT | |
89 | ||
90 | dnl | |
91 | dnl Find makeinfo. If makeinfo is not found, look for Emacs. If | |
48ea1035 AM |
92 | @@ -563,6 +563,4 @@ |
93 | dnl Create output | |
94 | dnl | |
95 | AC_OUTPUT([Makefile src/Makefile doc/Makefile util/Makefile po/Makefile.in | |
96 | - windows/Makefile], | |
97 | -[WGET_PROCESS_PO | |
98 | -test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h]) | |
99 | + windows/Makefile]) | |
100 | diff -urN wget-1.9-b5.org/Makefile.in wget-1.9-b5/Makefile.in | |
101 | --- wget-1.9-b5.org/Makefile.in 2003-10-12 23:55:54.000000000 +0200 | |
102 | +++ wget-1.9-b5/Makefile.in 2003-10-13 00:29:14.000000000 +0200 | |
103 | @@ -82,7 +82,7 @@ | |
104 | infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)' | |
105 | ||
106 | # subdirectories in the distribution | |
107 | -SUBDIRS = src doc po util windows | |
108 | +SUBDIRS = src doc intl po util windows | |
109 | ||
110 | # default target | |
111 | all: libtool src/config.h Makefile $(SUBDIRS) | |
112 | @@ -106,7 +106,7 @@ | |
113 | ||
114 | # Install `.mo' files | |
115 | install.mo: | |
116 | - cd po && $(MAKE) $(MAKEDEFS) $@ | |
117 | + cd po && $(MAKE) $(MAKEDEFS) install | |
118 | ||
119 | # Regenerate libtool if ltconfig and/or ltmain are updated | |
120 | libtool: $(LIBTOOL_DEPS) | |
121 | diff -urN wget-1.9-b5.org/src/main.c wget-1.9-b5/src/main.c | |
122 | --- wget-1.9-b5.org/src/main.c 2003-10-12 23:55:54.000000000 +0200 | |
123 | +++ wget-1.9-b5/src/main.c 2003-10-13 00:14:16.000000000 +0200 | |
65f0aada JB |
124 | @@ -44,11 +44,11 @@ |
125 | #ifdef HAVE_SIGNAL_H | |
126 | # include <signal.h> | |
127 | #endif | |
128 | -#ifdef HAVE_NLS | |
129 | +#ifdef ENABLE_NLS | |
130 | #ifdef HAVE_LOCALE_H | |
131 | # include <locale.h> | |
132 | #endif /* HAVE_LOCALE_H */ | |
133 | -#endif /* HAVE_NLS */ | |
134 | +#endif /* ENABLE_NLS */ | |
135 | #include <errno.h> | |
48ea1035 AM |
136 | #ifndef errno |
137 | extern int errno; | |
72f0b3b2 | 138 | @@ -98,9 +98,9 @@ |
65f0aada JB |
139 | static void |
140 | i18n_initialize (void) | |
141 | { | |
142 | - /* If HAVE_NLS is defined, assume the existence of the three | |
143 | + /* If ENABLE_NLS is defined, assume the existence of the three | |
144 | functions invoked here. */ | |
145 | -#ifdef HAVE_NLS | |
146 | +#ifdef ENABLE_NLS | |
147 | /* Set the current locale. */ | |
148 | /* Here we use LC_MESSAGES instead of LC_ALL, for two reasons. | |
149 | First, message catalogs are all of I18N Wget uses anyway. | |
72f0b3b2 | 150 | @@ -117,7 +117,7 @@ |
65f0aada JB |
151 | /* Set the text message domain. */ |
152 | bindtextdomain ("wget", LOCALEDIR); | |
153 | textdomain ("wget"); | |
154 | -#endif /* HAVE_NLS */ | |
155 | +#endif /* ENABLE_NLS */ | |
156 | } | |
157 | \f | |
158 | /* Print the usage message. */ | |
48ea1035 AM |
159 | diff -urN wget-1.9-b5.org/src/wget.h wget-1.9-b5/src/wget.h |
160 | --- wget-1.9-b5.org/src/wget.h 2003-10-12 23:55:54.000000000 +0200 | |
161 | +++ wget-1.9-b5/src/wget.h 2003-10-13 00:14:16.000000000 +0200 | |
162 | @@ -54,14 +54,12 @@ | |
65f0aada JB |
163 | |
164 | /* `gettext (FOO)' is long to write, so we use `_(FOO)'. If NLS is | |
165 | unavailable, _(STRING) simply returns STRING. */ | |
166 | -#ifdef HAVE_NLS | |
167 | +#ifdef ENABLE_NLS | |
168 | # define _(string) gettext (string) | |
169 | -# ifdef HAVE_LIBINTL_H | |
170 | # include <libintl.h> | |
171 | -# endif /* HAVE_LIBINTL_H */ | |
172 | -#else /* not HAVE_NLS */ | |
173 | +#else /* not ENABLE_NLS */ | |
174 | # define _(string) string | |
175 | -#endif /* not HAVE_NLS */ | |
176 | +#endif /* not ENABLE_NLS */ | |
177 | ||
72f0b3b2 AM |
178 | /* No-op version of gettext, used for constant strings. */ |
179 | #define N_(string) (string) |