160 lines
5.0 KiB
Plaintext
160 lines
5.0 KiB
Plaintext
$NetBSD$
|
|
|
|
Include termcap in the termcap test
|
|
Support Minix
|
|
|
|
--- lib/libedit/configure.orig 2018-12-26 19:14:51.625069299 +0000
|
|
+++ lib/libedit/configure
|
|
@@ -5140,7 +5140,7 @@ else
|
|
lt_cv_sys_max_cmd_len=8192;
|
|
;;
|
|
|
|
- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
|
|
+ bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd*)
|
|
# This has been around since 386BSD, at least. Likely further.
|
|
if test -x /sbin/sysctl; then
|
|
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
|
|
@@ -5609,12 +5609,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
|
|
lt_cv_deplibs_check_method=pass_all
|
|
;;
|
|
|
|
-netbsd*)
|
|
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
|
|
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
|
|
- else
|
|
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
|
|
- fi
|
|
+netbsd* | minix*)
|
|
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
|
|
;;
|
|
|
|
newos6*)
|
|
@@ -9284,14 +9280,13 @@ _LT_EOF
|
|
fi
|
|
;;
|
|
|
|
- netbsd*)
|
|
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
|
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
|
|
- wlarc=
|
|
- else
|
|
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
|
- fi
|
|
+ netbsd* | minix*)
|
|
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
+ hardcode_direct=yes
|
|
+ hardcode_shlibpath_var=no
|
|
+ output_verbose_link_cmd=func_echo_all
|
|
;;
|
|
|
|
solaris*)
|
|
@@ -9975,15 +9970,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
|
|
esac
|
|
;;
|
|
|
|
- netbsd*)
|
|
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
|
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
|
|
- else
|
|
- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
|
|
- fi
|
|
- hardcode_libdir_flag_spec='-R$libdir'
|
|
+ netbsd* | minix*)
|
|
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
hardcode_direct=yes
|
|
hardcode_shlibpath_var=no
|
|
+ output_verbose_link_cmd=func_echo_all
|
|
;;
|
|
|
|
newsos6)
|
|
@@ -11090,6 +11083,18 @@ fi
|
|
dynamic_linker='GNU/Linux ld.so'
|
|
;;
|
|
|
|
+minix*)
|
|
+ version_type=linux
|
|
+ need_lib_prefix=no
|
|
+ need_version=no
|
|
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
+ dynamic_linker='Minix ld.elf_so'
|
|
+ shlibpath_var=LD_LIBRARY_PATH
|
|
+ shlibpath_overrides_runpath=yes
|
|
+ hardcode_into_libs=yes
|
|
+ ;;
|
|
+
|
|
netbsd*)
|
|
version_type=sunos
|
|
need_lib_prefix=no
|
|
@@ -12429,7 +12434,50 @@ test -n "$NROFF" || NROFF="/bin/false"
|
|
|
|
|
|
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
|
|
+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
|
|
+if test "${ac_cv_lib_curses_termcap+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-ltermcap $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 tgetent ();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+return tgetent ();
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_termcap_tgetent=yes
|
|
+else
|
|
+ ac_cv_lib_termcap_tgetent=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_termcap_tgetent" >&5
|
|
+$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
|
|
+if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_LIBTERMCAP 1
|
|
+_ACEOF
|
|
+
|
|
+ LIBS="-ltermcap $LIBS"
|
|
+
|
|
+else
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
|
|
$as_echo_n "checking for tgetent in -lcurses... " >&6; }
|
|
if ${ac_cv_lib_curses_tgetent+:} false; then :
|
|
@@ -12518,12 +12566,12 @@ _ACEOF
|
|
LIBS="-lncurses $LIBS"
|
|
|
|
else
|
|
- as_fn_error $? "libcurses or libncurses are required!" "$LINENO" 5
|
|
+ as_fn_error $? "libtermcap, libcurses or libncurses are required!" "$LINENO" 5
|
|
fi
|
|
|
|
fi
|
|
|
|
-
|
|
+fi
|
|
|
|
# Checks for header files.
|
|
ac_header_dirent=no
|