tdraw, resolv - plan9port - [fork] Plan 9 from user space (HTM) git clone git://src.adamsgaard.dk/plan9port (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit 866a7d1f265fd728dfeecfcdba2da4a53813079e (DIR) parent 4c7f9f830369b29285534eafddedfd3896e51bc3 (HTM) Author: rsc <devnull@localhost> Date: Tue, 14 Feb 2006 02:00:06 +0000 draw, resolv Diffstat: M bin/9l | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- (DIR) diff --git a/bin/9l b/bin/9l t@@ -62,14 +62,14 @@ then for i in $w do # can't trust the libraries about using - # libthread - we might not be linking with + # libthread or libdraw - we might not be linking with # those object files. a=` nm $PLAN9/lib/lib$i.a 2>/dev/null | grep '__p9l_autolib_[a-zA-Z0-9+-]*$' | sed 's/.*__p9l_autolib_//' | sort -u | - grep -v thread + egrep -v 'thread|draw' ` okayfn="true" for j in $a t@@ -150,6 +150,11 @@ then libsl="$libsl -lsec -l9" fi + if [ "x$needndb" = xtrue -a -f /usr/lib/libresolv.a ] + then + libsl="$libsl -lresolv" + fi + if [ "x$needdraw" = xtrue -a "x$WSYSTYPE" != xnowsys ] then if [ "x$X11" = "x" ] t@@ -297,7 +302,8 @@ fi xtmp=/tmp/9l.$$.$USER.out xxout() { - egrep -v 'is almost always misused|: In function `' $xtmp + sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . | + egrep -v 'is almost always misused' $xtmp rm -f $xtmp }