-diff -urN wget-1.9-beta3.org/configure.in wget-1.9-beta3/configure.in
---- wget-1.9-beta3.org/configure.in 2003-10-03 12:07:14.000000000 +0200
-+++ wget-1.9-beta3/configure.in 2003-10-03 12:15:57.000000000 +0200
-@@ -46,14 +46,14 @@
- dnl Get cannonical host
- dnl
- AC_CANONICAL_HOST
--AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os")
-+AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os", [OS type])
-
- dnl
- dnl Process features.
- dnl
- AC_ARG_WITH(socks,
- [ --with-socks use the socks library],
--[AC_DEFINE(HAVE_SOCKS)])
-+[AC_DEFINE(HAVE_SOCKS,,[Use the socks library])])
-
- AC_ARG_WITH(ssl,
- [[ --with-ssl[=SSL-ROOT] link with SSL support [default=auto]
-@@ -62,17 +62,17 @@
- AC_ARG_ENABLE(opie,
- [ --disable-opie disable support for opie or s/key FTP login],
- USE_OPIE=$enableval, USE_OPIE=yes)
--test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE)
-+test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE,,[FTP opie or s/key login support])
+--- wget-1.10.1/configure.in.orig 2005-08-11 23:35:27.000000000 +0200
++++ wget-1.10.1/configure.in 2005-08-28 13:42:34.625493608 +0200
+@@ -437,6 +437,7 @@
+ ALL_LINGUAS=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')`
- AC_ARG_ENABLE(digest,
- [ --disable-digest disable support for HTTP digest authorization],
- USE_DIGEST=$enableval, USE_DIGEST=yes)
--test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST)
-+test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST,,[HTTP digest authorization support])
-
- AC_ARG_ENABLE(debug,
- [ --disable-debug disable support for debugging output],
- ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes)
--test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG)
-+test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG,,[Support for debugging output])
-
- wget_need_md5=no
+ dnl internationalization macros
++AM_GNU_GETTEXT
+ WGET_WITH_NLS
-@@ -374,7 +374,7 @@
- dnl AC_MSG_RESULT doesn't look right here, but I'm not sure what
- dnl to use instead.
- AC_MSG_RESULT([Compiling in support for SSL in $ssl_root])
-- AC_DEFINE(HAVE_SSL)
-+ AC_DEFINE(HAVE_SSL,,[SSL support])
- AC_SUBST(SSL_INCLUDES)
- SSL_OBJ='gen_sslfunc$o'
- AC_SUBST(SSL_OBJ)
-@@ -416,7 +416,7 @@
- dnl specific to the Solaris MD5 library.
- if test x"$found_md5" = xno; then
- AC_CHECK_LIB(md5, md5_calc, [
-- AC_DEFINE(HAVE_SOLARIS_MD5)
-+ AC_DEFINE(HAVE_SOLARIS_MD5,,[Use Solaris MD5])
- LIBS="-lmd5 $LIBS"
- found_md5=yes
- ])
-@@ -426,19 +426,19 @@
- dnl implementation.
- if test x"$found_md5" = xno; then
- if test x"$ssl_success" = xyes; then
-- AC_DEFINE(HAVE_OPENSSL_MD5)
-+ AC_DEFINE(HAVE_OPENSSL_MD5,,[Use OpenSSL MD5])
- found_md5=yes
- fi
- fi
+ dnl
+@@ -473,5 +474,4 @@
+ #include "config-post.h"
+ ])
+ AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
+-AC_CONFIG_COMMANDS([default], [WGET_PROCESS_PO])
+ AC_OUTPUT
+diff -urN wget-1.9-b5.org/Makefile.in wget-1.9-b5/Makefile.in
+--- wget-1.9-b5.org/Makefile.in 2003-10-12 23:55:54.000000000 +0200
++++ wget-1.9-b5/Makefile.in 2003-10-13 00:29:14.000000000 +0200
+@@ -82,7 +82,7 @@
+ infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
- dnl If none of the above worked, use the one we ship with Wget.
- if test x"$found_md5" = xno; then
-- AC_DEFINE(HAVE_BUILTIN_MD5)
-+ AC_DEFINE(HAVE_BUILTIN_MD5,,[Use builtin MD5])
- found_md5=yes
- MD5_OBJ="$MD5_OBJ gnu-md5\$o"
- fi
- fi
--AC_DEFINE(HAVE_MD5)
-+AC_DEFINE(HAVE_MD5,,[Have MD5])
- AC_SUBST(MD5_OBJ)
+ # subdirectories in the distribution
+-SUBDIRS = src doc po util windows
++SUBDIRS = src doc intl po util windows
- dnl **********************************************************************
-@@ -522,7 +522,7 @@
- dnl new language was added.
+ # default target
+ all: libtool src/config.h Makefile $(SUBDIRS)
+@@ -106,7 +106,7 @@
- dnl internationalization macros
--WGET_WITH_NLS
-+AM_GNU_GETTEXT
+ # Install `.mo' files
+ install.mo:
+- cd po && $(MAKE) $(MAKEDEFS) $@
++ cd po && $(MAKE) $(MAKEDEFS) install
- dnl
- dnl Find makeinfo. If makeinfo is not found, look for Emacs. If
-diff -urN wget-1.9-beta3.org/src/main.c wget-1.9-beta3/src/main.c
---- wget-1.9-beta3.org/src/main.c 2003-10-03 12:07:14.000000000 +0200
-+++ wget-1.9-beta3/src/main.c 2003-10-03 12:07:21.000000000 +0200
-@@ -44,11 +44,11 @@
+ # Regenerate libtool if ltconfig and/or ltmain are updated
+ libtool: $(LIBTOOL_DEPS)
+--- wget-1.10/src/main.c.orig 2005-06-22 03:25:18.000000000 +0200
++++ wget-1.10/src/main.c 2005-06-22 03:25:48.000000000 +0200
+@@ -43,11 +43,11 @@
#ifdef HAVE_SIGNAL_H
# include <signal.h>
#endif
#endif /* HAVE_LOCALE_H */
-#endif /* HAVE_NLS */
+#endif /* ENABLE_NLS */
- #include <errno.h>
+ #include <assert.h>
- #include "wget.h"
-@@ -98,9 +98,9 @@
+ #include <errno.h>
+@@ -90,8 +90,8 @@
static void
i18n_initialize (void)
{
-- /* If HAVE_NLS is defined, assume the existence of the three
-+ /* If ENABLE_NLS is defined, assume the existence of the three
- functions invoked here. */
+- /* HAVE_NLS implies existence of functions invoked here. */
-#ifdef HAVE_NLS
++ /* ENABLE_NLS implies existence of functions invoked here. */
+#ifdef ENABLE_NLS
/* Set the current locale. */
- /* Here we use LC_MESSAGES instead of LC_ALL, for two reasons.
- First, message catalogs are all of I18N Wget uses anyway.
-@@ -117,7 +117,7 @@
+ /* Where possible, sets only LC_MESSAGES and LC_CTYPE. Other
+ categories, such as numeric, time, or collation, break code that
+@@ -110,7 +110,7 @@
/* Set the text message domain. */
bindtextdomain ("wget", LOCALEDIR);
textdomain ("wget");
+#endif /* ENABLE_NLS */
}
\f
- /* Print the usage message. */
-diff -urN wget-1.9-beta3.org/src/wget.h wget-1.9-beta3/src/wget.h
---- wget-1.9-beta3.org/src/wget.h 2003-10-03 12:07:14.000000000 +0200
-+++ wget-1.9-beta3/src/wget.h 2003-10-03 12:07:21.000000000 +0200
-@@ -53,14 +53,12 @@
+ /* Definition of command-line options. */
+--- wget-1.10/src/wget.h.orig 2005-06-22 03:26:51.000000000 +0200
++++ wget-1.10/src/wget.h 2005-06-22 03:27:04.000000000 +0200
+@@ -50,16 +50,16 @@
/* `gettext (FOO)' is long to write, so we use `_(FOO)'. If NLS is
unavailable, _(STRING) simply returns STRING. */
-#ifdef HAVE_NLS
+#ifdef ENABLE_NLS
# define _(string) gettext (string)
--# ifdef HAVE_LIBINTL_H
+ # ifdef HAVE_LIBINTL_H
# include <libintl.h>
--# endif /* HAVE_LIBINTL_H */
+ # else /* not HAVE_LIBINTL_H */
+ const char *gettext ();
+ # endif /* not HAVE_LIBINTL_H */
-#else /* not HAVE_NLS */
+#else /* not ENABLE_NLS */
- # define _(string) string
+ # define _(string) (string)
-#endif /* not HAVE_NLS */
+#endif /* not ENABLE_NLS */
- /* No-op version of gettext, used for constant strings. */
- #define N_(string) (string)
-
+ /* A pseudo function call that serves as a marker for the automated
+ extraction of messages, but does not call gettext(). The run-time
+--- wget-1.10.1/m4/wget.m4.orig 2005-06-27 00:06:49.000000000 +0200
++++ wget-1.10.1/m4/wget.m4 2005-08-28 13:31:58.190246472 +0200
+@@ -156,7 +156,7 @@
+ # program @code{ansi2knr}, which comes with Ghostscript.
+ # @end defmac
+
+-AC_DEFUN(AM_PROG_CC_STDC,
++AC_DEFUN([AM_PROG_CC_STDC],
+ [AC_REQUIRE([AC_PROG_CC])
+ AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
+ AC_CACHE_VAL(am_cv_prog_cc_stdc,
+@@ -390,7 +390,7 @@
+ dnl This is not strictly an Autoconf macro, because it is run from
+ dnl within `config.status' rather than from within configure. This
+ dnl is why special rules must be applied for it.
+-AC_DEFUN(WGET_PROCESS_PO,
++AC_DEFUN([WGET_PROCESS_PO],
+ [
+ dnl I wonder what the following several lines do...
+ if test "x$srcdir" != "x."; then
+@@ -426,7 +426,7 @@
+
+ dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+ dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
++AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+ [# Extract the first word of "$2", so it can be a program name with args.
+ set dummy $2; ac_word=[$]2
+ AC_MSG_CHECKING([for $ac_word])
projects / packages / wget.git / blobdiff