Module Name: othersrc
Committed By: lukem
Date: Sun Jul 5 10:19:32 UTC 2020
Modified Files:
othersrc/usr.bin/tnftp: Makefile.in configure tnftp_config.h.in
othersrc/usr.bin/tnftp/libedit: Makefile.in
othersrc/usr.bin/tnftp/src: Makefile.in
Log Message:
regen for --with-local-libedit
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.49 -r1.50 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.6 -r1.7 othersrc/usr.bin/tnftp/tnftp_config.h.in
cvs rdiff -u -r1.11 -r1.12 othersrc/usr.bin/tnftp/libedit/Makefile.in
cvs rdiff -u -r1.15 -r1.16 othersrc/usr.bin/tnftp/src/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/Makefile.in
diff -u othersrc/usr.bin/tnftp/Makefile.in:1.11 othersrc/usr.bin/tnftp/Makefile.in:1.12
--- othersrc/usr.bin/tnftp/Makefile.in:1.11 Sat Jul 4 14:59:16 2020
+++ othersrc/usr.bin/tnftp/Makefile.in Sun Jul 5 10:19:31 2020
@@ -50,7 +50,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@USE_LIBEDIT_TRUE@am__append_1 = libedit
+@WITH_LOCAL_LIBEDIT_TRUE@am__append_1 = libedit
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/tnftp_config.h.in \
Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.49 othersrc/usr.bin/tnftp/configure:1.50
--- othersrc/usr.bin/tnftp/configure:1.49 Sat Jul 4 14:59:16 2020
+++ othersrc/usr.bin/tnftp/configure Sun Jul 5 10:19:31 2020
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 1.34 .
+# From configure.ac Revision: 1.35 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for tnftp 20151004.
#
@@ -642,11 +642,13 @@ ac_includes_default="\
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
-USE_LIBEDIT_FALSE
-USE_LIBEDIT_TRUE
-LIBOBJS
+WITH_LOCAL_LIBEDIT_FALSE
+WITH_LOCAL_LIBEDIT_TRUE
+OPT_EDITCOMPLETE_FALSE
+OPT_EDITCOMPLETE_TRUE
WITH_SSL_FALSE
WITH_SSL_TRUE
+LIBOBJS
OPENSSL_LDFLAGS
OPENSSL_LIBS
OPENSSL_INCLUDES
@@ -774,6 +776,7 @@ enable_maintainer_mode
enable_editcomplete
enable_ipv6
enable_ssl
+with_local_libedit
with_socks
enable_dependency_tracking
enable_shared
@@ -1418,7 +1421,7 @@ Optional Features:
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
--enable-editcomplete turn on command line editing and completion
- [default=enabled]
+ (requires system or local libedit) [default=enabled]
--enable-ipv6 enable IPv6 support (if your OS supports it)
[default=enabled]
--enable-ssl enable SSL support (requires --with-openssl)
@@ -1435,6 +1438,9 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-local-libedit use local libedit instead of system library: yes;
+ auto (try system, fallback to local); no
+ [default=auto]
--with-socks enable support for (Dante) SOCKS5 proxy
[default=auto]
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
@@ -3185,6 +3191,14 @@ else
fi
+# Check whether --with-local-libedit was given.
+if test "${with_local_libedit+set}" = set; then :
+ withval=$with_local_libedit;
+else
+ with_local_libedit=auto
+fi
+
+
# Check whether --with-socks was given.
if test "${with_socks+set}" = set; then :
withval=$with_socks;
@@ -3205,6 +3219,7 @@ fi
+
#
# Checks for programs.
#
@@ -11853,8 +11868,13 @@ esac
#
# Checks for libraries.
#
+
+# Check if libedit is required, and which implementation.
+#
if test "$opt_editcomplete" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: --enable-editcomplete; checking for required features" >&5
+$as_echo "$as_me: --enable-editcomplete; checking for required features" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
$as_echo_n "checking for library containing tgetent... " >&6; }
if ${ac_cv_search_tgetent+:} false; then :
$as_echo_n "(cached) " >&6
@@ -11912,9 +11932,70 @@ else
as_fn_error $? "no relevant library found containing tgetent" "$LINENO" 5
fi
+ if test "$with_local_libedit" != yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for el_init in -ledit" >&5
+$as_echo_n "checking for el_init in -ledit... " >&6; }
+if ${ac_cv_lib_edit_el_init+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ledit $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char el_init ();
+int
+main ()
+{
+return el_init ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_edit_el_init=yes
+else
+ ac_cv_lib_edit_el_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_el_init" >&5
+$as_echo "$ac_cv_lib_edit_el_init" >&6; }
+if test "x$ac_cv_lib_edit_el_init" = xyes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: using system libedit" >&5
+$as_echo "$as_me: using system libedit" >&6;}
+ with_local_libedit=no
+else
+ if test "$with_local_libedit" = no; then :
+ as_fn_error $? "--without-local-libedit was given, but system libedit was not found" "$LINENO" 5
+fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: using local libedit" >&5
+$as_echo "$as_me: using local libedit" >&6;}
+ with_local_libedit=yes
+fi
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: using local libedit" >&5
+$as_echo "$as_me: using local libedit" >&6;}
+fi
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: --disable-editcomplete; disabling --with-local-libedit" >&5
+$as_echo "$as_me: --disable-editcomplete; disabling --with-local-libedit" >&6;}
+ $as_echo "#define NO_EDITCOMPLETE 1" >>confdefs.h
+ with_local_libedit=no
fi
+# Check for ns and socket libraries.
+#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
$as_echo_n "checking for library containing gethostbyname... " >&6; }
if ${ac_cv_search_gethostbyname+:} false; then :
@@ -12069,7 +12150,6 @@ fi
fi
-#
# Check for (Dante) SOCKS5.
#
if test "$with_socks" != no; then :
@@ -12139,11 +12219,8 @@ $as_echo "$as_me: WARNING: IPv6 is incom
opt_ipv6=no
fi
else
- if test "$with_socks" != "auto"; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "--with-socks was given, but SOCKSinit() was not found
-See \`config.log' for more details" "$LINENO" 5; }
+ if test "$with_socks" != auto; then :
+ as_fn_error $? "--with-socks was given, but SOCKSinit() was not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: disabling --with-socks" >&5
$as_echo "$as_me: disabling --with-socks" >&6;}
@@ -12152,7 +12229,6 @@ fi
fi
-#
# Check for OpenSSL.
#
@@ -12317,11 +12393,8 @@ $as_echo "$as_me: --with-ssl=$with_ssl;
$as_echo "$as_me: enabling SSL support" >&6;}
with_ssl=yes
else
- if test "$with_ssl" != "auto"; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "--with-ssl was given, but OpenSSL was not found
-See \`config.log' for more details" "$LINENO" 5; }
+ if test "$with_ssl" != auto; then :
+ as_fn_error $? "--with-ssl was given, but OpenSSL was not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: disabling --with-ssl" >&5
$as_echo "$as_me: disabling --with-ssl" >&6;}
@@ -12329,15 +12402,6 @@ $as_echo "$as_me: disabling --with-ssl"
fi
fi
- if test "$with_ssl" = yes; then
- WITH_SSL_TRUE=
- WITH_SSL_FALSE='#'
-else
- WITH_SSL_TRUE='#'
- WITH_SSL_FALSE=
-fi
-
-
#
# Checks for header files.
#
@@ -14552,15 +14616,6 @@ fi
fi
-# Use local libedit if editcomplete is requested
-#
-if test "$opt_editcomplete" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: --enable-editcomplete; using internal libedit" >&5
-$as_echo "$as_me: --enable-editcomplete; using internal libedit" >&6;}
-else
- CFLAGS="-DNO_EDITCOMPLETE $CFLAGS"
-fi
-
# Replace sl_init() (et al) if it provides the older API.
#
if test "$ac_cv_func_sl_init" = yes; then :
@@ -14630,12 +14685,28 @@ fi
fi
+ if test "$with_ssl" = yes; then
+ WITH_SSL_TRUE=
+ WITH_SSL_FALSE='#'
+else
+ WITH_SSL_TRUE='#'
+ WITH_SSL_FALSE=
+fi
+
if test "$opt_editcomplete" = yes; then
- USE_LIBEDIT_TRUE=
- USE_LIBEDIT_FALSE='#'
+ OPT_EDITCOMPLETE_TRUE=
+ OPT_EDITCOMPLETE_FALSE='#'
else
- USE_LIBEDIT_TRUE='#'
- USE_LIBEDIT_FALSE=
+ OPT_EDITCOMPLETE_TRUE='#'
+ OPT_EDITCOMPLETE_FALSE=
+fi
+
+ if test "$with_local_libedit" = yes; then
+ WITH_LOCAL_LIBEDIT_TRUE=
+ WITH_LOCAL_LIBEDIT_FALSE='#'
+else
+ WITH_LOCAL_LIBEDIT_TRUE='#'
+ WITH_LOCAL_LIBEDIT_FALSE=
fi
@@ -14778,8 +14849,12 @@ if test -z "${WITH_SSL_TRUE}" && test -z
as_fn_error $? "conditional \"WITH_SSL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${USE_LIBEDIT_TRUE}" && test -z "${USE_LIBEDIT_FALSE}"; then
- as_fn_error $? "conditional \"USE_LIBEDIT\" was never defined.
+if test -z "${OPT_EDITCOMPLETE_TRUE}" && test -z "${OPT_EDITCOMPLETE_FALSE}"; then
+ as_fn_error $? "conditional \"OPT_EDITCOMPLETE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_LOCAL_LIBEDIT_TRUE}" && test -z "${WITH_LOCAL_LIBEDIT_FALSE}"; then
+ as_fn_error $? "conditional \"WITH_LOCAL_LIBEDIT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -17027,6 +17102,8 @@ $as_echo "$as_me: Package:
$as_echo "$as_me: Prefix: $prefix" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Command-line editing: $opt_editcomplete" >&5
$as_echo "$as_me: Command-line editing: $opt_editcomplete" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Local libedit: $with_local_libedit" >&5
+$as_echo "$as_me: Local libedit: $with_local_libedit" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: IPv6 support: $opt_ipv6" >&5
$as_echo "$as_me: IPv6 support: $opt_ipv6" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: SOCKS5 proxy support: $with_socks" >&5
Index: othersrc/usr.bin/tnftp/tnftp_config.h.in
diff -u othersrc/usr.bin/tnftp/tnftp_config.h.in:1.6 othersrc/usr.bin/tnftp/tnftp_config.h.in:1.7
--- othersrc/usr.bin/tnftp/tnftp_config.h.in:1.6 Sun Jan 31 22:25:36 2016
+++ othersrc/usr.bin/tnftp/tnftp_config.h.in Sun Jul 5 10:19:31 2020
@@ -434,6 +434,9 @@
*/
#undef LT_OBJDIR
+/* Define if disabling command-line editing and completion. */
+#undef NO_EDITCOMPLETE
+
/* Name of package */
#undef PACKAGE
Index: othersrc/usr.bin/tnftp/libedit/Makefile.in
diff -u othersrc/usr.bin/tnftp/libedit/Makefile.in:1.11 othersrc/usr.bin/tnftp/libedit/Makefile.in:1.12
--- othersrc/usr.bin/tnftp/libedit/Makefile.in:1.11 Sat Jul 4 14:59:16 2020
+++ othersrc/usr.bin/tnftp/libedit/Makefile.in Sun Jul 5 10:19:32 2020
@@ -298,7 +298,10 @@ CLEANFILES = \
MAKELIST = AWK=$(AWK) $(SHELL) $(srcdir)/makelist
EXTRA_DIST = \
- TEST \
+ TEST/rl1.c \
+ TEST/tc1.c \
+ TEST/test_filecompletion.c \
+ TEST/wtc1.c \
chared.h \
chartype.h \
config.h \
@@ -311,6 +314,7 @@ EXTRA_DIST = \
histedit.h \
keymacro.h \
literal.h \
+ makelist \
map.h \
parse.h \
prompt.h \
Index: othersrc/usr.bin/tnftp/src/Makefile.in
diff -u othersrc/usr.bin/tnftp/src/Makefile.in:1.15 othersrc/usr.bin/tnftp/src/Makefile.in:1.16
--- othersrc/usr.bin/tnftp/src/Makefile.in:1.15 Sat Jul 4 14:59:16 2020
+++ othersrc/usr.bin/tnftp/src/Makefile.in Sun Jul 5 10:19:32 2020
@@ -52,19 +52,20 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = tnftp$(EXEEXT)
-@USE_LIBEDIT_TRUE@am__append_1 = \
-@USE_LIBEDIT_TRUE@ -I$(top_srcdir)/libedit
+@OPT_EDITCOMPLETE_TRUE@@WITH_LOCAL_LIBEDIT_TRUE@am__append_1 = \
+@OPT_EDITCOMPLETE_TRUE@@WITH_LOCAL_LIBEDIT_TRUE@ -I$(top_srcdir)/libedit
-@USE_LIBEDIT_TRUE@am__append_2 = \
-@USE_LIBEDIT_TRUE@ ../libedit/libedit.la
+@OPT_EDITCOMPLETE_TRUE@@WITH_LOCAL_LIBEDIT_TRUE@am__append_2 = \
+@OPT_EDITCOMPLETE_TRUE@@WITH_LOCAL_LIBEDIT_TRUE@ ../libedit/libedit.la
-@WITH_SSL_TRUE@am__append_3 = \
+@OPT_EDITCOMPLETE_TRUE@@WITH_LOCAL_LIBEDIT_FALSE@am__append_3 = -ledit
+@WITH_SSL_TRUE@am__append_4 = \
@WITH_SSL_TRUE@ ssl.c
-@WITH_SSL_TRUE@am__append_4 = \
+@WITH_SSL_TRUE@am__append_5 = \
@WITH_SSL_TRUE@ $(OPENSSL_INCLUDES)
-@WITH_SSL_TRUE@am__append_5 = \
+@WITH_SSL_TRUE@am__append_6 = \
@WITH_SSL_TRUE@ $(OPENSSL_LDFLAGS) \
@WITH_SSL_TRUE@ $(OPENSSL_LIBS)
@@ -99,7 +100,7 @@ am__DEPENDENCIES_1 =
@WITH_SSL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
@WITH_SSL_TRUE@ $(am__DEPENDENCIES_1)
tnftp_DEPENDENCIES = ../libnetbsd/libnetbsd.la $(am__append_2) \
- $(am__DEPENDENCIES_2)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -289,13 +290,13 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
tnftp_SOURCES = cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c \
- main.c progressbar.c ruserpass.c util.c $(am__append_3)
+ main.c progressbar.c ruserpass.c util.c $(am__append_4)
tnftp_CPPFLAGS = -DHAVE_TNFTPD_H=1 \
-D_DEFAULT_CONFDIR=\"${sysconfdir}\" -I$(srcdir) \
-I$(top_srcdir)/libnetbsd -I$(top_srcdir) -I$(top_builddir) \
- $(am__append_1) $(am__append_4)
+ $(am__append_1) $(am__append_5)
tnftp_LDADD = ../libnetbsd/libnetbsd.la $(am__append_2) \
- $(am__append_5)
+ $(am__append_3) $(am__append_6)
man1_MANS = \
tnftp.1
