]> git.pld-linux.org Git - packages/wget.git/blobdiff - wget-ac.patch
- real update for 1.10.1
[packages/wget.git] / wget-ac.patch
index ef8cff5b4bfdeda0d3e0e0225b648a0a7c533c19..668a10952519d533d0f37cc2b9257cdbc0185df2 100644 (file)
---- wget-1.7/configure.in~     Tue Aug 21 23:18:24 2001
-+++ wget-1.7/configure.in      Tue Aug 21 23:17:12 2001
-@@ -88,8 +88,7 @@
-       for i in inria kame linux toshiba v6d zeta; do
-               case $i in
-               inria)
--                      dnl http://www.kame.net/
--                      AC_EGREP_CPP(yes, [dnl
-+                      AC_EGREP_CPP(yes, [
- #include <netinet/in.h>
- #ifdef IPV6_INRIA_VERSION
- yes
-@@ -98,8 +97,7 @@
-                               CFLAGS="-DINET6 $CFLAGS"])
-                       ;;
-               kame)
--                      dnl http://www.kame.net/
--                      AC_EGREP_CPP(yes, [dnl
-+                      AC_EGREP_CPP(yes, [
- #include <netinet/in.h>
- #ifdef __KAME__
- yes
-@@ -108,7 +106,6 @@
-                               CFLAGS="-DINET6 $CFLAGS"])
-                       ;;
-               linux)
--                      dnl http://www.v6.linux.or.jp/
-                       if test -d /usr/inet6; then
-                               ipv6type=$i
-                               ipv6lib=inet6
-@@ -117,7 +114,7 @@
-                       fi
-                       ;;
-               toshiba)
--                      AC_EGREP_CPP(yes, [dnl
-+                      AC_EGREP_CPP(yes, [
- #include <sys/param.h>
- #ifdef _TOSHIBA_INET6
- yes
-@@ -128,7 +125,7 @@
-                               CFLAGS="-DINET6 $CFLAGS"])
-                       ;;
-               v6d)
--                      AC_EGREP_CPP(yes, [dnl
-+                      AC_EGREP_CPP(yes, [
- #include </usr/local/v6/include/sys/v6config.h>
- #ifdef __V6D__
- yes
-@@ -139,7 +136,7 @@
-                               CFLAGS="-I/usr/local/v6/include $CFLAGS"])
-                       ;;
-               zeta)
--                      AC_EGREP_CPP(yes, [dnl
-+                      AC_EGREP_CPP(yes, [
- #include <sys/param.h>
- #ifdef _ZETA_MINAMI_INET6
- yes
+--- 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' ' ')`
+ dnl internationalization macros
++AM_GNU_GETTEXT
+ WGET_WITH_NLS
+ 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)'
+ # subdirectories in the distribution
+-SUBDIRS = src doc po util windows
++SUBDIRS = src doc intl po util windows
+ # default target
+ all: libtool src/config.h Makefile $(SUBDIRS)
+@@ -106,7 +106,7 @@
+ # Install `.mo' files
+ install.mo:
+-      cd po && $(MAKE) $(MAKEDEFS) $@
++      cd po && $(MAKE) $(MAKEDEFS) install
+ # 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
+-#ifdef HAVE_NLS
++#ifdef ENABLE_NLS
+ #ifdef HAVE_LOCALE_H
+ # include <locale.h>
+ #endif /* HAVE_LOCALE_H */
+-#endif /* HAVE_NLS */
++#endif /* ENABLE_NLS */
+ #include <assert.h>
+ #include <errno.h>
+@@ -90,8 +90,8 @@
+ static void
+ i18n_initialize (void)
+ {
+-  /* 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.  */
+   /* 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 /* HAVE_NLS */
++#endif /* ENABLE_NLS */
+ }
\f
+ /* 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
+ #  include <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)
+-#endif /* not HAVE_NLS */
++#endif /* not ENABLE_NLS */
+ /* 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])
This page took 0.033614 seconds and 4 git commands to generate.