summaryrefslogtreecommitdiff
path: root/wget
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-10-13 21:01:30 +0000
committerChris Larson <clarson@kergoth.com>2004-10-13 21:01:30 +0000
commitcb376e8e2dd00e1ffaa862360b4693b749a35d35 (patch)
tree92835b788a509bb7d27cec70a0a4472ed6ba94ba /wget
parent32a679020b270c1950ea549779fdee75757f6152 (diff)
Merge http://nslu2-linux.bkbits.net/packages
into handhelds.org:/home/kergoth/code/packages 2004/10/13 06:35:50-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/10/13 00:18:03+09:30 (none)!rwhitby Merged in SECTION changes to nslu2 files 2004/10/13 00:13:58+09:30 (none)!rwhitby Merge 2004/10/09 22:38:19-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/10/10 14:51:40+09:30 (none)!rwhitby Created separate unslung-standard-image, unslung-ext3flash-image and unslung-vfatdisk2-image packages, each of which uses the corresponding nslu2 kernel. 2004/10/08 06:14:59-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/10/07 15:16:32-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/10/07 02:20:57-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/10/06 16:12:22-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/10/06 09:11:13+09:30 (none)!rwhitby Added default and required definitions of TARGET_OS and TARGET_FPU to the Unslung and OpenSlug ditros 2004/10/05 02:41:44-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/10/04 21:26:48-04:00 rant-central.com!CodeWhacker Stretch the ramdisk back up to 10M, the max size the kernel is set up for. 2004/10/03 23:34:21-04:00 rant-central.com!CodeWhacker Add the modules needed to mount disks. 2004/09/30 23:03:04-04:00 rant-central.com!CodeWhacker Reset ramdisk size to 8M. 2004/09/29 14:31:35-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/09/29 21:27:18+09:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/09/29 21:25:14+09:30 (none)!rwhitby Commented out the calls to AM_PATH_PROG_WITH_TEST. I have no idea whether this is the correct fix or not, but it is enough to get wget building again. 2004/09/29 02:51:24-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/09/29 07:04:16+09:30 (none)!rwhitby Merge bk://nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/09/28 14:31:42-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/09/28 18:22:38+09:30 (none)!rwhitby Merge bk://nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/09/28 08:41:19+09:30 (none)!rwhitby Merge http://openembedded.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/09/27 16:19:13-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/09/28 00:08:45+09:30 (none)!rwhitby Updated to unslung 2.2-alpha - unsling works, ipkg update works - need to work on base-files, sysvinit, update-rc.d, etc. now 2004/09/27 23:49:20+09:30 (none)!rwhitby Back to where we where before splicing. Now we should splice by adding ipkgs. 2004/09/27 23:19:44+09:30 (none)!rwhitby Modifed a whole lot of unslung stuff to conform with the discussion with Kergoth. 2004/09/27 23:10:42+09:30 (none)!rwhitby Added packages to recreate the nslu2 linksys firmware from scratch. 2004/09/27 22:08:57+09:30 (none)!rwhitby Added /bin/tinylogin to the device table for the stock linksys nslu2 ramdisk 2004/09/27 22:01:08+09:30 (none)!rwhitby Device table for the stock linksys nslu2 ramdisk 2004/09/27 21:46:23+09:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/09/27 21:45:41+09:30 (none)!rwhitby Device table for the stock linksys nslu2 ramdisk 2004/09/26 16:03:29-04:00 rant-central.com!roy Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into rant-central.com:/home/roy/workspace/NSLU2/oe/packages 2004/09/26 16:01:26-04:00 rant-central.com!roy Added the patch from http://groups.yahoo.com/group/nslu2-linux/message/1735 to address the ~60 sec hang during boot. 2004/09/27 00:28:15+09:30 (none)!rwhitby Fixed some Unslung 2.1 errors 2004/09/27 00:04:13+09:30 (none)!rwhitby Unslung 2.1: Faked out enough of sysvinit to allow dropbear to be installed 2004/09/26 20:21:39+09:30 (none)!rwhitby Finalised a set of libc6 libraries which don't seem to cause any problems. 2004/09/26 12:51:18+09:30 (none)!rwhitby Commented out the libc6 files - one of them is making it fail. 2004/09/26 10:16:44+09:30 (none)!rwhitby Spliced in the rest of libc6, libgcc1, sed and wget 2004/09/26 08:08:35+09:30 (none)!rwhitby nslu2-unslung-ramdisk now stashes the half-built ramdisk in nslu2-binries between do_compile and do_rootfs. 2004/09/25 15:17:05-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/09/25 14:17:26-04:00 rant-central.com!roy Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into rant-central.com:/home/roy/workspace/NSLU2/oe/packages 2004/09/25 14:13:49-04:00 rant-central.com!roy Adds the USB networking modules to the openslug kernel build 2004/09/25 14:11:27-04:00 rant-central.com!roy Adds export of 2 pci symbols the USB networking modules (and probably others) need. 2004/09/25 21:54:09+09:30 (none)!rwhitby Unslung 2.0-alpha can now unsling disks and install old-style ipkgs from our Unslung 1.x repository. 2004/09/25 20:57:34+09:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/09/25 20:56:52+09:30 (none)!rwhitby Spliced gcc lib and sed and minimal ipkg stuff 2004/09/24 18:44:21-07:00 bitkeeper.com!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages 2004/09/25 01:02:41+09:30 (none)!rwhitby Updated nslu2-unslung-ramdisk with next milestone - a rootfs built from ipks, some of which needs to be spliced into the ramdisk. 2004/09/24 22:54:57+09:30 (none)!rwhitby Modified rootfs_ipk so that it would allow an empty IPKG_INSTALL (useful for building a rootfs up from scratch). 2004/09/24 22:39:08+09:30 (none)!rwhitby Initial attempt at including a rootfs built from ipkgs 2004/09/24 22:35:13+09:30 (none)!rwhitby Initial attempt at including a rootfs built from ipkgs 2004/09/24 08:04:37+09:30 (none)!rwhitby Added a default kernel specification to unslung BKrev: 416d97aarDhCyN_CmtJHZ0d3uwZiAQ
Diffstat (limited to 'wget')
-rw-r--r--wget/wget-1.9.1/m4macros.patch214
1 files changed, 214 insertions, 0 deletions
diff --git a/wget/wget-1.9.1/m4macros.patch b/wget/wget-1.9.1/m4macros.patch
index e69de29bb2..7b25d213b9 100644
--- a/wget/wget-1.9.1/m4macros.patch
+++ b/wget/wget-1.9.1/m4macros.patch
@@ -0,0 +1,214 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- wget-1.9.1/aclocal.m4~m4macros.patch
++++ wget-1.9.1/aclocal.m4
+@@ -2,6 +2,7 @@
+ dnl Check for `struct utimbuf'.
+ dnl
+
++AH_TEMPLATE([HAVE_STRUCT_UTIMBUF], [Define if we have struct utimbuf])
+ AC_DEFUN([WGET_STRUCT_UTIMBUF],
+ [AC_MSG_CHECKING([for struct utimbuf])
+ if test x"$ac_cv_header_utime_h" = xyes; then
+@@ -21,6 +22,7 @@
+ dnl it. If socklen_t exists, we use it, else if accept() accepts
+ dnl size_t *, we use that, else we use int.
+
++AH_TEMPLATE([socklen_t], [Set to the appropriate type to use for socklen_t])
+ AC_DEFUN([WGET_SOCKLEN_T], [
+ AC_MSG_CHECKING(for socklen_t)
+ AC_TRY_COMPILE([
+@@ -50,6 +52,7 @@
+ dnl even on those because Apache installs its own fnmatch.h to
+ dnl /usr/local/include (!), which GCC uses before /usr/include.
+
++AH_TEMPLATE([HAVE_WORKING_FNMATCH_H], [Define if we have a working fnmatch.h])
+ AC_DEFUN([WGET_FNMATCH], [
+ AC_MSG_CHECKING([for working fnmatch.h])
+ AC_COMPILE_IFELSE([#include <fnmatch.h>
+@@ -61,87 +64,6 @@
+ ])
+ ])
+
+-dnl
+-dnl ansi2knr support: check whether C prototypes are available.
+-dnl
+-
+-AC_DEFUN(AM_C_PROTOTYPES,
+-[AC_REQUIRE([AM_PROG_CC_STDC])
+-AC_BEFORE([$0], [AC_C_INLINE])
+-AC_MSG_CHECKING([for function prototypes])
+-if test "$am_cv_prog_cc_stdc" != no; then
+- AC_MSG_RESULT(yes)
+- AC_DEFINE(PROTOTYPES)
+- U= ANSI2KNR=
+-else
+- AC_MSG_RESULT(no)
+- U=_ ANSI2KNR=./ansi2knr
+- # Ensure some checks needed by ansi2knr itself.
+- AC_HEADER_STDC
+- AC_CHECK_HEADERS(string.h)
+-fi
+-AC_SUBST(U)dnl
+-AC_SUBST(ANSI2KNR)dnl
+-])
+-
+-
+-# serial 1
+-
+-# @defmac AC_PROG_CC_STDC
+-# @maindex PROG_CC_STDC
+-# @ovindex CC
+-# If the C compiler in not in ANSI C mode by default, try to add an option
+-# to output variable @code{CC} to make it so. This macro tries various
+-# options that select ANSI C on some system or another. It considers the
+-# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and
+-# handles function prototypes correctly.
+-#
+-# If you use this macro, you should check after calling it whether the C
+-# compiler has been set to accept ANSI C; if not, the shell variable
+-# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source
+-# code in ANSI C, you can make an un-ANSIfied copy of it by using the
+-# program @code{ansi2knr}, which comes with Ghostscript.
+-# @end defmac
+-
+-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,
+-[am_cv_prog_cc_stdc=no
+-ac_save_CC="$CC"
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX -qlanglvl=ansi
+-# Ultrix and OSF/1 -std1
+-# HP-UX -Aa -D_HPUX_SOURCE
+-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE"
+-do
+- CC="$ac_save_CC $ac_arg"
+- AC_TRY_COMPILE(
+-[#if !defined(__STDC__)
+-choke me
+-#endif
+-/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */
+-#ifdef _SEQUENT_
+-# include <sys/types.h>
+-# include <sys/stat.h>
+-#endif
+-], [
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};],
+-[am_cv_prog_cc_stdc="$ac_arg"; break])
+-done
+-CC="$ac_save_CC"
+-])
+-AC_MSG_RESULT($am_cv_prog_cc_stdc)
+-case "x$am_cv_prog_cc_stdc" in
+- x|xno) ;;
+- *) CC="$CC $am_cv_prog_cc_stdc" ;;
+-esac
+-])
+-
+-
+ dnl ************************************************************
+ dnl START OF IPv6 AUTOCONFIGURATION SUPPORT MACROS
+ dnl ************************************************************
+@@ -294,7 +216,8 @@
+
+ # This code originates from Ulrich Drepper's AM_WITH_NLS.
+
+-AC_DEFUN(WGET_WITH_NLS,
++AH_TEMPLATE([HAVE_NLS], [Define to enable Native Language Support])
++AC_DEFUN([WGET_WITH_NLS],
+ [AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+ AC_ARG_ENABLE(nls,
+@@ -308,12 +231,12 @@
+
+ if test x"$HAVE_NLS" = xyes; then
+ AC_MSG_RESULT([language catalogs: $ALL_LINGUAS])
+- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+- AC_SUBST(MSGFMT)
+- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++# AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
++# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
++# AC_SUBST(MSGFMT)
++# AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+ CATOBJEXT=.gmo
+ INSTOBJEXT=.mo
+ DATADIRNAME=share
+@@ -387,7 +310,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
+@@ -409,56 +332,3 @@
+ echo "creating po/Makefile"
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ ])
+-
+-# Search path for a program which passes the given test.
+-# Ulrich Drepper <drepper@cygnus.com>, 1996.
+-#
+-# This file may be copied and used freely without restrictions. It
+-# can be used in projects which are not available under the GNU Public
+-# License but which still want to provide support for the GNU gettext
+-# functionality. Please note that the actual code is *not* freely
+-# available.
+-
+-# serial 1
+-
+-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,
+-[# 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])
+-AC_CACHE_VAL(ac_cv_path_$1,
+-[case "[$]$1" in
+- /*)
+- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+- ;;
+- *)
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in ifelse([$5], , $PATH, [$5]); do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/$ac_word; then
+- if [$3]; then
+- ac_cv_path_$1="$ac_dir/$ac_word"
+- break
+- fi
+- fi
+- done
+- IFS="$ac_save_ifs"
+-dnl If no 4th arg is given, leave the cache variable unset,
+-dnl so AC_PATH_PROGS will keep looking.
+-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+-])dnl
+- ;;
+-esac])dnl
+-$1="$ac_cv_path_$1"
+-if test -n "[$]$1"; then
+- AC_MSG_RESULT([$]$1)
+-else
+- AC_MSG_RESULT(no)
+-fi
+-AC_SUBST($1)dnl
+-])
+-
+-# Include libtool code.
+-
+-builtin(include, libtool.m4)dnl