27 lines
790 B
Text
27 lines
790 B
Text
$NetBSD: patch-ab,v 1.2 2004/01/21 17:43:55 recht Exp $
|
|
|
|
--- configure.orig 2003-10-21 04:32:25.000000000 +0200
|
|
+++ configure 2004-01-21 18:22:46.000000000 +0100
|
|
@@ -905,11 +905,8 @@
|
|
then
|
|
case "$FEATURE_XFT" in
|
|
define)
|
|
- xft="-lXft "
|
|
- if [ -d /usr/include/freetype2 ]
|
|
- then
|
|
- CC="$CC -I/usr/include/freetype2"
|
|
- fi
|
|
+ xft="`pkg-config --libs freetype2 xft` "
|
|
+ CC="$CC `pkg-config --cflags freetype2 xft`"
|
|
;;
|
|
*)
|
|
xft=""
|
|
@@ -950,7 +947,7 @@
|
|
|
|
|
|
# Generate the "config.h" file
|
|
-ELVISPATH=`echo "~/.elvis:/etc/elvis:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
|
|
+ELVISPATH=`echo "~/.elvis:@PKG_SYSCONFDIR@:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
|
|
cat >config.h <<eof-config
|
|
/* config.h */
|
|
|