tfontsrv: only build when the pieces are there - 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 cb71c0bdc4f605fceafe10ffd2959af693290145
(DIR) parent 1a512ec048a5c607a01b9fd82561c1601ba87406
(HTM) Author: Russ Cox <rsc@swtch.com>
Date: Tue, 18 Dec 2012 07:22:19 -0800
fontsrv: only build when the pieces are there
Diffstat:
M INSTALL | 15 +++++++++++++++
M src/cmd/mkfile | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
---
(DIR) diff --git a/INSTALL b/INSTALL
t@@ -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
(DIR) diff --git a/src/cmd/mkfile b/src/cmd/mkfile
t@@ -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