1 --- wget-1.10.1/configure.in.orig 2005-08-11 23:35:27.000000000 +0200
2 +++ wget-1.10.1/configure.in 2005-08-28 13:42:34.625493608 +0200
4 ALL_LINGUAS=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')`
6 dnl internationalization macros
12 #include "config-post.h"
14 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
15 -AC_CONFIG_COMMANDS([default], [WGET_PROCESS_PO])
17 diff -urN wget-1.9-b5.org/Makefile.in wget-1.9-b5/Makefile.in
18 --- wget-1.9-b5.org/Makefile.in 2003-10-12 23:55:54.000000000 +0200
19 +++ wget-1.9-b5/Makefile.in 2003-10-13 00:29:14.000000000 +0200
21 infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
23 # subdirectories in the distribution
24 -SUBDIRS = src doc po util windows
25 +SUBDIRS = src doc intl po util windows
28 all: libtool src/config.h Makefile $(SUBDIRS)
33 - cd po && $(MAKE) $(MAKEDEFS) $@
34 + cd po && $(MAKE) $(MAKEDEFS) install
36 # Regenerate libtool if ltconfig and/or ltmain are updated
37 libtool: $(LIBTOOL_DEPS)
38 --- wget-1.10/src/main.c.orig 2005-06-22 03:25:18.000000000 +0200
39 +++ wget-1.10/src/main.c 2005-06-22 03:25:48.000000000 +0200
48 #endif /* HAVE_LOCALE_H */
49 -#endif /* HAVE_NLS */
50 +#endif /* ENABLE_NLS */
56 i18n_initialize (void)
58 - /* HAVE_NLS implies existence of functions invoked here. */
60 + /* ENABLE_NLS implies existence of functions invoked here. */
62 /* Set the current locale. */
63 /* Where possible, sets only LC_MESSAGES and LC_CTYPE. Other
64 categories, such as numeric, time, or collation, break code that
66 /* Set the text message domain. */
67 bindtextdomain ("wget", LOCALEDIR);
69 -#endif /* HAVE_NLS */
70 +#endif /* ENABLE_NLS */
73 /* Definition of command-line options. */
74 --- wget-1.10/src/wget.h.orig 2005-06-22 03:26:51.000000000 +0200
75 +++ wget-1.10/src/wget.h 2005-06-22 03:27:04.000000000 +0200
78 /* `gettext (FOO)' is long to write, so we use `_(FOO)'. If NLS is
79 unavailable, _(STRING) simply returns STRING. */
82 # define _(string) gettext (string)
83 # ifdef HAVE_LIBINTL_H
85 # else /* not HAVE_LIBINTL_H */
86 const char *gettext ();
87 # endif /* not HAVE_LIBINTL_H */
88 -#else /* not HAVE_NLS */
89 +#else /* not ENABLE_NLS */
90 # define _(string) (string)
91 -#endif /* not HAVE_NLS */
92 +#endif /* not ENABLE_NLS */
94 /* A pseudo function call that serves as a marker for the automated
95 extraction of messages, but does not call gettext(). The run-time
96 --- wget-1.10.1/m4/wget.m4.orig 2005-06-27 00:06:49.000000000 +0200
97 +++ wget-1.10.1/m4/wget.m4 2005-08-28 13:31:58.190246472 +0200
99 # program @code{ansi2knr}, which comes with Ghostscript.
102 -AC_DEFUN(AM_PROG_CC_STDC,
103 +AC_DEFUN([AM_PROG_CC_STDC],
104 [AC_REQUIRE([AC_PROG_CC])
105 AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
106 AC_CACHE_VAL(am_cv_prog_cc_stdc,
108 dnl This is not strictly an Autoconf macro, because it is run from
109 dnl within `config.status' rather than from within configure. This
110 dnl is why special rules must be applied for it.
111 -AC_DEFUN(WGET_PROCESS_PO,
112 +AC_DEFUN([WGET_PROCESS_PO],
114 dnl I wonder what the following several lines do...
115 if test "x$srcdir" != "x."; then
118 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
119 dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
120 -AC_DEFUN(AM_PATH_PROG_WITH_TEST,
121 +AC_DEFUN([AM_PATH_PROG_WITH_TEST],
122 [# Extract the first word of "$2", so it can be a program name with args.
123 set dummy $2; ac_word=[$]2
124 AC_MSG_CHECKING([for $ac_word])