File tnftp-20100108-am_and_libedit.patch of Package tnftp

Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -62,10 +62,16 @@ AH_TEMPLATE([USE_SOCKS],
 #
 # Checks for programs.
 #
-AC_PROG_CC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
+AM_PROG_AR
+AM_PROG_CC_C_O
 AC_PROG_AWK
 AC_PROG_LIBTOOL
 
+PKG_CHECK_MODULES([LIBEDIT], [libedit])
+
 #
 # Checks for tool features.
 #
@@ -86,13 +92,6 @@ AS_CASE([$target_os],
 #
 # Checks for libraries.
 #
-AS_IF([test "$opt_editcomplete" = yes],
-      [AC_SEARCH_LIBS([tgetent],
-                      [termcap termlib curses ncurses tinfo],
-                      [],
-                      [AC_MSG_ERROR(
-                           [no relevant library found containing tgetent])])
-       ])
 
 AC_SEARCH_LIBS([gethostbyname], [nsl])
 AC_SEARCH_LIBS([socket],
@@ -230,7 +229,6 @@ AC_CHECK_MEMBERS([struct sockaddr.sa_len
                  [], [], [$accheck_includes])
 AC_CHECK_TYPES([in_port_t, sa_family_t, socklen_t, struct addrinfo],
                [], [], [$accheck_includes])
-AC_SYS_LARGEFILE
 
 # If IPv6 is enabled, check for necessary items.
 #
@@ -346,7 +344,7 @@ exit(!res);
 # Use local libedit if editcomplete is requested
 #
 AS_IF([test "$opt_editcomplete" = yes],
-      [AC_MSG_NOTICE([--enable-editcomplete; using internal libedit])],
+      [AC_MSG_NOTICE([--enable-editcomplete; using system libedit])],
       [CFLAGS="-DNO_EDITCOMPLETE $CFLAGS"])
 
 # Replace sl_init() (et al) if it provides the older API.
@@ -385,8 +383,6 @@ AM_CONDITIONAL([USE_LIBEDIT], [test "$op
 #
 AC_CONFIG_FILES([
         Makefile
-        libedit/Makefile
-        libedit/makelist
         libnetbsd/Makefile
         src/Makefile
 ])
Index: src/Makefile.am
===================================================================
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -28,10 +28,10 @@ tnftp_LDADD = \
 
 if USE_LIBEDIT
 tnftp_CPPFLAGS += \
-	-I$(top_srcdir)/libedit
+	$(LIBEDIT_CFLAGS)
 
 tnftp_LDADD += \
-	../libedit/libedit.la
+	$(LIBEDIT_LIBS)
 endif
 
 
Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -2,10 +2,6 @@
 
 SUBDIRS = libnetbsd
 
-if USE_LIBEDIT
-SUBDIRS += libedit
-endif
-
 SUBDIRS += src
 
 EXTRA_DIST = \
Index: libnetbsd/Makefile.am
===================================================================
--- libnetbsd/Makefile.am.orig
+++ libnetbsd/Makefile.am
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libnetbsd.la
 libnetbsd_la_SOURCES =
 
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
 	-I$(srcdir) \
 	-I$(top_srcdir) \
 	-I$(top_builddir)