$NetBSD: patch-aa,v 1.3 1999/04/23 04:19:25 mycroft Exp $ --- configure.orig Thu May 21 14:16:26 1998 +++ configure Thu Apr 22 20:30:57 1999 @@ -5098,7 +5098,7 @@ TERMLIBS="" -for termlib in ncurses curses termcap terminfo termlib; do +for termlib in termcap terminfo termlib; do echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6 echo "configure:5104: checking for tputs in -l${termlib}" >&5 ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'` @@ -5150,12 +5150,10 @@ if test "$ac_cv_lib_termcap_tputs" = yes \ || test "$ac_cv_lib_terminfo_tputs" = yes \ - || test "$ac_cv_lib_ncurses_tputs" = yes \ - || test "$ac_cv_lib_curses_tputs" = yes \ || test "$ac_cv_lib_termlib_tputs" = yes; then true else - warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!" + warn_termlibs="I couldn't find -ltermcap, -lterminfo, or -ltermlib!" echo "configure: warning: $warn_termlibs" 1>&2 fi @@ -6100,7 +6098,6 @@ # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo "configure:6103: checking for a BSD compatible install" >&5 -if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6139,7 +6136,6 @@ # removed, or if the path is relative. INSTALL="$ac_install_sh" fi -fi echo "$ac_t""$INSTALL" 1>&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -7126,10 +7122,7 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac + ac_given_INSTALL="${INSTALL}" echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" # The eval makes quoting arguments work.