diff options
| author | Russ Cox <rsc@swtch.com> | 2012-12-18 07:22:19 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2012-12-18 07:22:19 -0800 |
| commit | cb71c0bdc4f605fceafe10ffd2959af693290145 (patch) | |
| tree | 1e9807bf217f21cb2dddea4453011c147b949115 | |
| parent | 1a512ec048a5c607a01b9fd82561c1601ba87406 (diff) | |
| download | plan9port-cb71c0bdc4f605fceafe10ffd2959af693290145.tar.gz plan9port-cb71c0bdc4f605fceafe10ffd2959af693290145.tar.bz2 plan9port-cb71c0bdc4f605fceafe10ffd2959af693290145.zip | |
fontsrv: only build when the pieces are there
| -rwxr-xr-x | INSTALL | 15 | ||||
| -rw-r--r-- | src/cmd/mkfile | 4 |
2 files changed, 17 insertions, 2 deletions
@@ -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 diff --git a/src/cmd/mkfile b/src/cmd/mkfile index 9541f5ca..d2563033 100644 --- a/src/cmd/mkfile +++ b/src/cmd/mkfile @@ -4,8 +4,8 @@ TARG=`ls *.[cy] *.lx | egrep -v "\.tab\.c$|^x\." | sed 's/\.[cy]//; s/\.lx//'` <$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 |