From: Chris Larson <clarson@kergoth.com>
Date: Mon, 10 May 2004 16:18:09 +0000 (+0000)
Subject: Merge openembedded@openembedded.bkbits.net:packages
X-Git-Tag: Release-2010-05/1~19231
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a119c7e9ed34de0a44afef918f38081e97d0f1be;p=openembedded.git

Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages

2004/05/10 12:17:42-04:00 local!kergoth
Add the m4 and autotools patches for lrzsz.  Build still fails with @CATALOGS@ not being sed substituted on the makefiles.

BKrev: 409fab417sELLtPecFFu03biyeA0_g
---

diff --git a/lrzsz/lrzsz-0.12.20/autotools.patch b/lrzsz/lrzsz-0.12.20/autotools.patch
index e69de29bb2..73f5a062ef 100644
--- a/lrzsz/lrzsz-0.12.20/autotools.patch
+++ b/lrzsz/lrzsz-0.12.20/autotools.patch
@@ -0,0 +1,37 @@
+--- lrzsz-0.12.20/acinclude.m4~autotools	1998-12-27 17:08:59.000000000 -0500
++++ lrzsz-0.12.20/acinclude.m4	2004-05-09 22:26:19.000000000 -0400
+@@ -1,12 +1,11 @@
+ dnl AC_REPLACE_GNU_GETOPT
+-AC_DEFUN(AC_REPLACE_GNU_GETOPT,
+-[AC_CHECK_FUNC(getopt_long, , [LIBOBJS="$LIBOBJS getopt1.o getopt.o"])
+-AC_SUBST(LIBOBJS)dnl
+-])
++AC_DEFUN([AC_REPLACE_GNU_GETOPT],
++[AC_CHECK_FUNC(getopt_long, , [AC_LIBOBJ([getopt1])
++AC_LIBOBJ([getopt])dnl])])
+ 
+ dnl
+ dnl taken from taylor uucp
+-AC_DEFUN(LRZSZ_ERRNO_DECL,[
++AC_DEFUN([LRZSZ_ERRNO_DECL],[
+ AC_MSG_CHECKING(for errno declaration)
+ AC_CACHE_VAL(lrzsz_cv_decl_errno,
+ [AC_TRY_COMPILE([#include <errno.h>], [int i = errno; errno = 1;],
+@@ -23,7 +21,7 @@
+ ])
+ 
+ dnl LRZSZ_TYPE_SPEED_T
+-AC_DEFUN(LRZSZ_TYPE_SPEED_T,[
++AC_DEFUN([LRZSZ_TYPE_SPEED_T],[
+ AC_REQUIRE([AC_HEADER_STDC])dnl
+ AC_REQUIRE([LRZSZ_HEADERS_TERM_IO])dnl
+ AC_MSG_CHECKING(for speed_t)
+@@ -61,7 +59,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(lrzsz_HEADER_SYS_SELECT,
++AC_DEFUN([lrzsz_HEADER_SYS_SELECT],
+ [AC_CACHE_CHECK([whether sys/time.h and sys/select.h may both be included],
+   lrzsz_cv_header_sys_select,
+ [AC_TRY_COMPILE([#include <sys/types.h>
diff --git a/lrzsz/lrzsz-0.12.20/m4.patch b/lrzsz/lrzsz-0.12.20/m4.patch
new file mode 100644
index 0000000000..e69de29bb2