$NetBSD: patch-aa,v 1.10 2004/01/12 15:19:28 wennmach Exp $

--- configure.orig	2003-05-28 14:34:23.000000000 +0900
+++ configure	2004-01-11 04:18:35.000000000 +0900
@@ -4108,7 +4108,7 @@
   # XXX: freetype2 may use freetype-config
  	echo "$as_me:$LINENO: checking for freetype1 library/header" >&5
 echo $ECHO_N "checking for freetype1 library/header... $ECHO_C" >&6
- 	for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr /usr/include/freetype1 ; do
+ 	for dir in ${BUILDLINK_DIR}; do
  		ac_cv_ft_lib=no
  		ac_cv_ft_include=no
 		shlib1=`echo $dir/lib/libttf.so* | head -1 | sed -e 's/.*\///'`
@@ -4379,15 +4379,13 @@
 echo "$as_me:$LINENO: result: $mgp_use_xft2" >&5
 echo "${ECHO_T}$mgp_use_xft2" >&6
 if test "$mgp_use_xft2" = "yes"; then
-  if type pkg-config > /dev/null 2>&1; then
-     if pkg-config xft; then
-        OPTFLAGS="`pkg-config --cflags xft` $OPTFLAGS"
-        LIBS="$LIBS `pkg-config --libs xft`"
-        cat >>confdefs.h <<\_ACEOF
+  if type pkg-config > /dev/null 2>&1 && pkg-config xft; then
+     OPTFLAGS="`pkg-config --cflags xft` $OPTFLAGS"
+     LIBS="$LIBS `pkg-config --libs xft`"
+     cat >>confdefs.h <<\_ACEOF
 #define USE_XFT2 1
 _ACEOF
 
-     fi
   else
 	echo "$as_me:$LINENO: checking for xft2 and ft2 and fc header.." >&5
 echo $ECHO_N "checking for xft2 and ft2 and fc header..... $ECHO_C" >&6
@@ -4643,7 +4641,7 @@
 if test "$mgp_use_vflib" = "yes"; then
 	echo "$as_me:$LINENO: checking for VFlib library/header" >&5
 echo $ECHO_N "checking for VFlib library/header... $ECHO_C" >&6
-	for dir in /usr/local/VFlib /usr/local/vflib /usr/local /usr/pkg /usr; do
+	for dir in ${BUILDLINK_DIR}; do
 		ac_cv_vf_libname=VFlib
 		ac_cv_vf_libdir=no
 		ac_cv_vf_hdrdir=no
@@ -4815,6 +4813,7 @@
 		    /usr/local/lib /usr/local/etc /etc \
 		    /usr/local/libdata/vflib /usr/local/share/VFlib \
 		    /usr/local/share/VFlib/* \
+		    ${prefix}/share/VFlib/* \
 		    ../../VFlib* ../VFlib* VFlib*; do
 			if test -d $ac_dir -a -f $ac_dir/vfontcap; then
 				ac_cv_vf_fontcap=$ac_dir/vfontcap;
@@ -4857,17 +4856,15 @@
 	fi
 fi
 
-if type pkg-config > /dev/null 2>&1; then
-  if pkg-config libpng; then
-     LIBS="$LIBS `pkg-config --libs libpng`"
-     OPTFLAGS="$OPTFLAGS `pkg-config --cflags libpng`"
-     cat >>confdefs.h <<\_ACEOF
+if type pkg-config > /dev/null 2>&1 && pkg-config libpng; then
+  LIBS="$LIBS `pkg-config --libs libpng`"
+  OPTFLAGS="$OPTFLAGS `pkg-config --cflags libpng`"
+  cat >>confdefs.h <<\_ACEOF
 #define USE_PNG 1
 _ACEOF
 
-  fi
 else
-  for i in /usr/pkg /usr/local /usr; do
+  for i in ${BUILDLINK_DIR}; do
 	if test -f $i/include/png.h; then
 		if test -f $i/lib/libpng.a ; then
 			DEPLIBS="$DEPLIBS $i/lib/libpng.a"
@@ -5010,7 +5007,7 @@
   done
 fi
 
-for i in /usr/pkg /usr/local /usr; do
+for i in ${BUILDLINK_DIR}; do
 	if test -f $i/include/libmng.h; then
 		if test -f $i/lib/libmng.a ; then
 			DEPLIBS="$DEPLIBS $i/lib/libmng.a"
@@ -5647,7 +5644,7 @@
 		echo 'FATAL: You need libungif to use gif images.  pass proper LIBS to configure.'
 		exit 1
 	fi
-	for i in /usr/pkg /usr/local /usr; do
+	for i in ${BUILDLINK_DIR}; do
 		if test -f $i/include/gif_lib.h; then
 			gif_h_ok=yes
 			OPTFLAGS="$OPTFLAGS -I$i/include"
@@ -5677,16 +5674,14 @@
 echo "$as_me:$LINENO: result: $mgp_imlib" >&5
 echo "${ECHO_T}$mgp_imlib" >&6
 if test $mgp_imlib = "yes"; then
-  if type pkg-config > /dev/null 2>&1; then
-     if pkg-config imlib; then
-        LIBS="$LIBS `pkg-config --libs imlib`"
-        OPTFLAGS="$OPTFLAGS `pkg-config --cflags imlib`"
-	cat >>confdefs.h <<\_ACEOF
+  if type pkg-config > /dev/null 2>&1 && pkg-config imlib; then
+     LIBS="$LIBS `pkg-config --libs imlib`"
+     OPTFLAGS="$OPTFLAGS `pkg-config --cflags imlib`"
+     cat >>confdefs.h <<\_ACEOF
 #define USE_IMLIB 1
 _ACEOF
 
 	USE_IMLIB=1
-     fi
   else
 	echo "$as_me:$LINENO: checking for Imlib_init in -lImlib" >&5
 echo $ECHO_N "checking for Imlib_init in -lImlib... $ECHO_C" >&6
@@ -5757,7 +5752,7 @@
 		echo 'FATAL: You need libImlib to use Imlib loading.  pass proper LIBS to configure.'
 		exit 1
 	fi
-	for i in /usr/pkg /usr/local; do
+	for i in ${BUILDLINK_DIR}; do
 		if test -f $i/include/Imlib.h; then
 			imlib_h_ok=yes
 			OPTFLAGS="$OPTFLAGS -I$i/include"