draw, resolv

1 files changed, 9 insertions, 3 deletions

diff --git a/bin/9l b/bin/9l
index 5fdf23e9..7862d7f2 100755
--- a/bin/9l
+++ b/bin/9l
@@ -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
@@ -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" ]
@@ -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
 }