$NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $ --- Configure.orig 2001-02-22 14:17:39.000000000 -0500 +++ Configure 2006-09-26 15:17:42.033788587 -0400 @@ -2540,7 +2540,7 @@ esac ;; *) case "$d_inews" in - '') dflt="$prefix/bin";; + '') dflt=none;; "$define") set dflt installinews bin eval $prefixit @@ -4412,6 +4412,9 @@ nm_so_opt='--dynamic' fi ;; + *dragonfly*) + nm_so_opt='-D' + ;; esac ;; esac @@ -4882,6 +4885,25 @@ esac case "$xxx" in x) + xxx=`./loc libncurses$_a x $libpth` + case "$xxx" in + /usr/lib*|/lib*) + termlib='-lncurses' + d_havetlib="$define" + echo "Termlib library found." >&4 + ;; + /*) + termlib="$xxx" + d_havetlib="$define" + echo "Termlib library found." >&4 + ;; + *) + xxx=x + esac + ;; +esac +case "$xxx" in +x) xxx=`./loc libtermlib$_a x $libpth` case "$xxx" in /usr/lib*|/lib*) @@ -4939,6 +4961,25 @@ esac case "$xxx" in x) + xxx=`./loc libncurses.$so'*' x $libpth` + case "$xxx" in + /usr/lib*|/lib*) + termlib='-lncurses' + d_havetlib="$define" + echo "Terminfo library found." >&4 + ;; + /*) + termlib="$xxx" + d_havetlib="$define" + echo "Terminfo library found." >&4 + ;; + *) + xxx=x + esac + ;; +esac +case "$xxx" in +x) xxx=`./loc libtermlib.$so'*' x $libpth` case "$xxx" in /usr/lib*|/lib*) @@ -6223,14 +6264,14 @@ acttimes='$acttimes' aphostcmd='$aphostcmd' archobjs='$archobjs' -awk='$awk' -basename='$basename' +awk='$TOOLS_AWK' +basename='$TOOLS_BASENAME' bash='$bash' bin='$bin' binexp='$binexp' byacc='$byacc' c='$c' -cat='$cat' +cat='$TOOLS_CAT' cc='$cc' ccflags='$ccflags' cf_by='$cf_by' @@ -6240,7 +6281,7 @@ comm='$comm' contains='$contains' contdist='$contdist' -cp='$cp' +cp='$TOOLS_CP' cpp='$cpp' cppflags='$cppflags' cpplast='$cpplast' @@ -6305,21 +6346,21 @@ d_xthread='$d_xthread' date='$date' defeditor='$defeditor' -diff='$diff' +diff='$TOOLS_DIFF' direntrytype='$direntrytype' -echo='$echo' +echo='$TOOLS_ECHO' ed='$ed' -egrep='$egrep' +egrep='$TOOLS_EGREP' eunicefix='$eunicefix' exe_ext='$exe_ext' -expr='$expr' +expr='$TOOLS_EXPR' extrainews='$extrainews' filexp='$filexp' find='$find' firstmakefile='$firstmakefile' gccversion='$gccversion' glibpth='$glibpth' -grep='$grep' +grep='$TOOLS_GREP' groupdesc='$groupdesc' hint='$hint' hostbits='$hostbits' @@ -6376,10 +6417,10 @@ mimecap='$mimecap' mips='$mips' mips_type='$mips_type' -mkdir='$mkdir' +mkdir='$TOOLS_MKDIR' more='$more' multistatedist='$multistatedist' -mv='$mv' +mv='$TOOLS_MV' myactive='$myactive' myuname='$myuname' n='$n' @@ -6417,11 +6458,11 @@ prefshell='$prefshell' privlib='$privlib' privlibexp='$privlibexp' -rm='$rm' +rm='$TOOLS_RM' rmail='$rmail' rootid='$rootid' runnm='$runnm' -sed='$sed' +sed='$TOOLS_SED' sendmail='$sendmail' servername='$servername' sharpbang='$sharpbang' @@ -6442,7 +6483,7 @@ strn='$strn' subscriptions='$subscriptions' sysman='$sysman' -tail='$tail' +tail='$TOOLS_TAIL' tee='$tee' termlib='$termlib' test='$test' @@ -6450,7 +6491,7 @@ tk='$tk' tkinc='$tkinc' tklibs='$tklibs' -tr='$tr' +tr='$TOOLS_TR' trn_init='$trn_init' trn_select='$trn_select' trnl='$trnl'