]>
Commit | Line | Data |
---|---|---|
65f0aada JB |
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 | |
4 | @@ -0,0 +1,11 @@ | |
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)], | |
12 | + AC_MSG_RESULT(no)) | |
13 | +else | |
14 | + AC_MSG_RESULT(no) | |
15 | +fi]) | |
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 | |
19 | @@ -46,14 +46,14 @@ | |
20 | dnl Get cannonical host | |
21 | dnl | |
22 | AC_CANONICAL_HOST | |
23 | -AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os") | |
24 | +AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os", [OS type]) | |
25 | ||
26 | dnl | |
27 | dnl Process features. | |
28 | dnl | |
29 | AC_ARG_WITH(socks, | |
30 | [ --with-socks use the socks library], | |
31 | -[AC_DEFINE(HAVE_SOCKS)]) | |
32 | +[AC_DEFINE(HAVE_SOCKS,,[Use the socks library])]) | |
33 | ||
34 | AC_ARG_WITH(ssl, | |
35 | [ --with-ssl[=SSL-ROOT] link with SSL support [default=auto] | |
36 | @@ -62,17 +62,17 @@ | |
37 | AC_ARG_ENABLE(opie, | |
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]) | |
42 | ||
43 | AC_ARG_ENABLE(digest, | |
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]) | |
48 | ||
49 | AC_ARG_ENABLE(debug, | |
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]) | |
54 | ||
55 | wget_need_md5=no | |
56 | ||
57 | @@ -374,7 +374,7 @@ | |
58 | dnl AC_MSG_RESULT doesn't look right here, but I'm not sure what | |
59 | dnl to use instead. | |
60 | AC_MSG_RESULT("Compiling in support for SSL in $ssl_root") | |
61 | - AC_DEFINE(HAVE_SSL) | |
62 | + AC_DEFINE(HAVE_SSL,,[SSL support]) | |
63 | AC_SUBST(SSL_INCLUDES) | |
64 | SSL_OBJ='gen_sslfunc$o' | |
65 | AC_SUBST(SSL_OBJ) | |
66 | @@ -416,7 +416,7 @@ | |
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]) | |
72 | LIBS="-lmd5 $LIBS" | |
73 | found_md5=yes | |
74 | ]) | |
75 | @@ -426,19 +426,19 @@ | |
76 | dnl implementation. | |
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]) | |
81 | found_md5=yes | |
82 | fi | |
83 | fi | |
84 | ||
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]) | |
89 | found_md5=yes | |
90 | MD5_OBJ="$MD5_OBJ gnu-md5\$o" | |
91 | fi | |
92 | fi | |
93 | -AC_DEFINE(HAVE_MD5) | |
94 | +AC_DEFINE(HAVE_MD5,,[Have MD5]) | |
95 | AC_SUBST(MD5_OBJ) | |
96 | ||
97 | dnl | |
98 | @@ -452,7 +452,7 @@ | |
99 | dnl new language was added. | |
100 | ||
101 | dnl internationalization macros | |
102 | -WGET_WITH_NLS | |
103 | +AM_GNU_GETTEXT | |
104 | ||
105 | dnl | |
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 | |
110 | @@ -44,11 +44,11 @@ | |
111 | #ifdef HAVE_SIGNAL_H | |
112 | # include <signal.h> | |
113 | #endif | |
114 | -#ifdef HAVE_NLS | |
115 | +#ifdef ENABLE_NLS | |
116 | #ifdef HAVE_LOCALE_H | |
117 | # include <locale.h> | |
118 | #endif /* HAVE_LOCALE_H */ | |
119 | -#endif /* HAVE_NLS */ | |
120 | +#endif /* ENABLE_NLS */ | |
121 | #include <errno.h> | |
122 | ||
123 | #define OPTIONS_DEFINED_HERE /* for options.h */ | |
124 | @@ -97,9 +97,9 @@ | |
125 | static void | |
126 | i18n_initialize (void) | |
127 | { | |
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. */ | |
131 | -#ifdef HAVE_NLS | |
132 | +#ifdef ENABLE_NLS | |
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. | |
136 | @@ -116,7 +116,7 @@ | |
137 | /* Set the text message domain. */ | |
138 | bindtextdomain ("wget", LOCALEDIR); | |
139 | textdomain ("wget"); | |
140 | -#endif /* HAVE_NLS */ | |
141 | +#endif /* ENABLE_NLS */ | |
142 | } | |
143 | \f | |
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 | |
148 | @@ -53,14 +53,12 @@ | |
149 | ||
150 | /* `gettext (FOO)' is long to write, so we use `_(FOO)'. If NLS is | |
151 | unavailable, _(STRING) simply returns STRING. */ | |
152 | -#ifdef HAVE_NLS | |
153 | +#ifdef ENABLE_NLS | |
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 */ | |
163 | ||
164 | /* I18N NOTE: You will notice that none of the DEBUG messages are | |
165 | marked as translatable. This is intentional, for a few reasons: |