commit 1a512ec048a5c607a01b9fd82561c1601ba87406
author Christian Kellermann <ckeen@pestilenz.org> Tue Dec 11 12:45:45 2012 -0500
committer Russ Cox <rsc@swtch.com> Tue Dec 11 12:45:45 2012 -0500
tree 60571e9860161ac608d7ba5b180fbb9e98469503
parent 0b4fd921055175e9dda8c424f9252f4141507742

fontsrv: fix build on OpenBSD 5.2

R=rsc
CC=plan9port.codebot
https://codereview.appspot.com/6850108

CONTRIBUTORS

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7215408..63effd2 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -12,6 +12,7 @@
 Arvindh Rajesh Tamilmani <art@a-30.net>
 Benjamin Huntsman <BHuntsman@mail2.cu-portland.edu>
 Caio Oliveira <cmarcelo@gmail.com>
+Christian Kellermann <ckeen@pestilenz.org>
 Christopher Brannon <chris@the-brannons.com>
 David du Colombier <0intro@gmail.com>
 David Jeannot <djeannot24@gmail.com>

INSTALL

diff --git a/INSTALL b/INSTALL
index 7625cc8..1ce9bd0 100755
--- a/INSTALL
+++ b/INSTALL
@@ -45,6 +45,11 @@
 echo "* Compiler version:"
 9c -v 2>&1 | grep -v 'Configured with:' | grep -i version | sed 's/^/	/'
 
+if [ `uname` = OpenBSD ]; then
+       echo "* Running on OpenBSD, adjusting linker flags"
+       echo "LDFLAGS='-L/usr/X11R6/lib -pthread'" >> $PLAN9/config
+fi
+
 if [ `uname` = Linux ]; then
 	# On Linux, we use the kernel version to decide whether
 	# to use pthreads or not.  On 2.6 versions that aren't

src/cmd/devdraw/mkwsysrules.sh

diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh
index dde44c8..9c42226 100644
--- a/src/cmd/devdraw/mkwsysrules.sh
+++ b/src/cmd/devdraw/mkwsysrules.sh
@@ -45,6 +45,7 @@
 	
 echo 'WSYSTYPE='$WSYSTYPE
 echo 'X11='$X11
+echo 'X11H='$X11H
 
 if [ $WSYSTYPE = x11 ]; then
 	echo 'CFLAGS=$CFLAGS '$X11H

src/cmd/fontsrv/freetyperules.sh

diff --git a/src/cmd/fontsrv/freetyperules.sh b/src/cmd/fontsrv/freetyperules.sh
index ca7a026..7b9a002 100644
--- a/src/cmd/fontsrv/freetyperules.sh
+++ b/src/cmd/fontsrv/freetyperules.sh
@@ -1,7 +1,12 @@
 #!/bin/sh
 
 if [ "x$1" = "xx11" ]; then
-	echo 'CFLAGS=$CFLAGS -I/usr/include/freetype2' 
+	if [ "x$2" = "x" ]; then
+		i=/usr/include
+	else
+		i=$2
+	fi
+	echo 'CFLAGS=$CFLAGS '$i'/freetype2' 
         echo 'LDFLAGS=$LDFLAGS -lfontconfig -lfreetype -lz'
 fi
 

src/cmd/fontsrv/mkfile

diff --git a/src/cmd/fontsrv/mkfile b/src/cmd/fontsrv/mkfile
index 9fbbd52..eed0355 100644
--- a/src/cmd/fontsrv/mkfile
+++ b/src/cmd/fontsrv/mkfile
@@ -1,6 +1,6 @@
 <$PLAN9/src/mkhdr
 <|sh ../devdraw/mkwsysrules.sh
-<|sh freetyperules.sh $WSYSTYPE
+<|sh freetyperules.sh $WSYSTYPE $X11H
 
 TARG=fontsrv