]>
Commit | Line | Data |
---|---|---|
c9c57a6c JB |
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 | |
2aef51db | 3 | @@ -541,7 +541,8 @@ |
65f0aada JB |
4 | dnl new language was added. |
5 | ||
6 | dnl internationalization macros | |
7 | -WGET_WITH_NLS | |
8 | +AM_GNU_GETTEXT | |
2aef51db | 9 | +WGET_WITH_NLS |
65f0aada JB |
10 | |
11 | dnl | |
5ce934a3 | 12 | dnl Find makeinfo. We used to provide support for Emacs processing |
48ea1035 AM |
13 | diff -urN wget-1.9-b5.org/Makefile.in wget-1.9-b5/Makefile.in |
14 | --- wget-1.9-b5.org/Makefile.in 2003-10-12 23:55:54.000000000 +0200 | |
15 | +++ wget-1.9-b5/Makefile.in 2003-10-13 00:29:14.000000000 +0200 | |
16 | @@ -82,7 +82,7 @@ | |
17 | infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)' | |
18 | ||
19 | # subdirectories in the distribution | |
20 | -SUBDIRS = src doc po util windows | |
21 | +SUBDIRS = src doc intl po util windows | |
22 | ||
23 | # default target | |
24 | all: libtool src/config.h Makefile $(SUBDIRS) | |
25 | @@ -106,7 +106,7 @@ | |
26 | ||
27 | # Install `.mo' files | |
28 | install.mo: | |
29 | - cd po && $(MAKE) $(MAKEDEFS) $@ | |
30 | + cd po && $(MAKE) $(MAKEDEFS) install | |
31 | ||
32 | # Regenerate libtool if ltconfig and/or ltmain are updated | |
33 | libtool: $(LIBTOOL_DEPS) | |
5ce934a3 | 34 | --- wget-1.10/src/main.c.orig 2005-06-22 03:25:18.000000000 +0200 |
35 | +++ wget-1.10/src/main.c 2005-06-22 03:25:48.000000000 +0200 | |
36 | @@ -43,11 +43,11 @@ | |
65f0aada JB |
37 | #ifdef HAVE_SIGNAL_H |
38 | # include <signal.h> | |
39 | #endif | |
40 | -#ifdef HAVE_NLS | |
41 | +#ifdef ENABLE_NLS | |
42 | #ifdef HAVE_LOCALE_H | |
43 | # include <locale.h> | |
44 | #endif /* HAVE_LOCALE_H */ | |
45 | -#endif /* HAVE_NLS */ | |
46 | +#endif /* ENABLE_NLS */ | |
5ce934a3 | 47 | #include <assert.h> |
48 | ||
65f0aada | 49 | #include <errno.h> |
5ce934a3 | 50 | @@ -90,8 +90,8 @@ |
65f0aada JB |
51 | static void |
52 | i18n_initialize (void) | |
53 | { | |
5ce934a3 | 54 | - /* HAVE_NLS implies existence of functions invoked here. */ |
65f0aada | 55 | -#ifdef HAVE_NLS |
5ce934a3 | 56 | + /* ENABLE_NLS implies existence of functions invoked here. */ |
65f0aada JB |
57 | +#ifdef ENABLE_NLS |
58 | /* Set the current locale. */ | |
5ce934a3 | 59 | /* Where possible, sets only LC_MESSAGES and LC_CTYPE. Other |
60 | categories, such as numeric, time, or collation, break code that | |
61 | @@ -110,7 +110,7 @@ | |
65f0aada JB |
62 | /* Set the text message domain. */ |
63 | bindtextdomain ("wget", LOCALEDIR); | |
64 | textdomain ("wget"); | |
65 | -#endif /* HAVE_NLS */ | |
66 | +#endif /* ENABLE_NLS */ | |
67 | } | |
68 | \f | |
5ce934a3 | 69 | /* Definition of command-line options. */ |
70 | --- wget-1.10/src/wget.h.orig 2005-06-22 03:26:51.000000000 +0200 | |
71 | +++ wget-1.10/src/wget.h 2005-06-22 03:27:04.000000000 +0200 | |
72 | @@ -50,16 +50,16 @@ | |
65f0aada JB |
73 | |
74 | /* `gettext (FOO)' is long to write, so we use `_(FOO)'. If NLS is | |
75 | unavailable, _(STRING) simply returns STRING. */ | |
76 | -#ifdef HAVE_NLS | |
77 | +#ifdef ENABLE_NLS | |
78 | # define _(string) gettext (string) | |
5ce934a3 | 79 | # ifdef HAVE_LIBINTL_H |
65f0aada | 80 | # include <libintl.h> |
5ce934a3 | 81 | # else /* not HAVE_LIBINTL_H */ |
82 | const char *gettext (); | |
83 | # endif /* not HAVE_LIBINTL_H */ | |
65f0aada JB |
84 | -#else /* not HAVE_NLS */ |
85 | +#else /* not ENABLE_NLS */ | |
5ce934a3 | 86 | # define _(string) (string) |
65f0aada JB |
87 | -#endif /* not HAVE_NLS */ |
88 | +#endif /* not ENABLE_NLS */ | |
89 | ||
5ce934a3 | 90 | /* A pseudo function call that serves as a marker for the automated |
91 | extraction of messages, but does not call gettext(). The run-time |