commit cb71c0bdc4f605fceafe10ffd2959af693290145
from: Russ Cox <rsc@swtch.com>
date: Tue Dec 18 15:22:19 2012 UTC

fontsrv: only build when the pieces are there

commit - 1a512ec048a5c607a01b9fd82561c1601ba87406
commit + cb71c0bdc4f605fceafe10ffd2959af693290145
blob - 1ce9bd0c62e9874b00731a2a64d9594f9e732109
blob + a0e208eeabe6a6a38dad7acc32590ad79da84045
--- INSTALL
+++ INSTALL
@@ -89,6 +89,21 @@ if [ `uname` = Darwin ]; then
 	rm -f ./a.out
 fi
 
+if [ `uname` != Darwin ]; then
+	# Determine whether fontsrv X11 files are available.
+	rm -f a.out
+	gcc -o a.out -c -Iinclude -I/usr/include -I/usr/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1
+	if [ -f a.out ]; then
+		echo "	fontsrv dependencies found."
+		echo "FONTSRV=fontsrv" >>$PLAN9/config
+	else
+		echo "	fontsrv dependencies not found."
+		echo "FONTSRV=" >>$PLAN9/config
+		rm -f bin/fontsrv
+	fi
+	rm -f a.out
+fi
+
 if [ -f LOCAL.config ]; then
 	echo Using LOCAL.config options:
 	sed 's/^/	/' LOCAL.config
blob - 9541f5ca5b74f1cfc989392c89e99c0a099df199
blob + d256303341ad40f5b35df7b62d4d2e9b930cd760
--- src/cmd/mkfile
+++ src/cmd/mkfile
@@ -4,8 +4,8 @@ TARG=`ls *.[cy] *.lx | egrep -v "\.tab\.c$|^x\." | sed
 
 <$PLAN9/src/mkmany
 
-BUGGERED='CVS|faces|factotum|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer'
-DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'`
+BUGGERED='CVS|faces|factotum|fontsrv|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer'
+DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'` $FONTSRV
 
 <$PLAN9/src/mkdirs