commit dad9d0ac8faf5482c0305a1da7356b1b1982c0a0 from: Martin Neubauer via: Russ Cox date: Thu Jan 31 01:45:28 2013 UTC fontserv: fix build on FreeBSD 9.1 R=rsc https://codereview.appspot.com/7095050 commit - 0497ad9724e9b2bf60191dd1d54876aaa9e568a3 commit + dad9d0ac8faf5482c0305a1da7356b1b1982c0a0 blob - a0e208eeabe6a6a38dad7acc32590ad79da84045 blob + 8bc208b1ad5e60e4fc092baff3810f7a4b369571 --- INSTALL +++ INSTALL @@ -45,6 +45,11 @@ rm -f config echo "* Compiler version:" 9c -v 2>&1 | grep -v 'Configured with:' | grep -i version | sed 's/^/ /' +if [ `uname` = FreeBSD ]; then + echo "* Running on FreeBSD, adjusting linker flags" + echo "LDFLAGS='-L/usr/local/lib'" >> $PLAN9/config +fi + if [ `uname` = OpenBSD ]; then echo "* Running on OpenBSD, adjusting linker flags" echo "LDFLAGS='-L/usr/X11R6/lib -pthread'" >> $PLAN9/config @@ -92,7 +97,7 @@ 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 + gcc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/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