$NetBSD: patch-ab,v 1.13 2005/07/08 09:47:02 adam Exp $

--- configure.orig	2005-06-19 03:23:02.000000000 +0000
+++ configure
@@ -21634,46 +21634,21 @@ fi
 
 
 
-supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW"
-supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW"
+supported_locales="bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN"
+supported_wprefs_locales="bg cs de es et fi fr hr hu it ja ko pt ru sk zh_CN"
 supported_wings_locales="bg ca cs de fr sk"
 
-for lang in $LINGUAS; do
-	ok=0
-	for l in $supported_locales; do
-		if test "$l" = "$lang"; then
-			ok=1
-			break
-		fi
-	done
-	if test "$ok" = 1; then
-		MOFILES="$MOFILES $lang.mo"
-	else
-		echo "Locale $lang is not supported."
-	fi
-	ok=0
-	for l in $supported_wprefs_locales; do
-		if test "$l" = "$lang"; then
-			ok=1
-			break
-		fi
-	done
-	if test "$ok" = 1; then
-		WPMOFILES="$WPMOFILES $lang.mo"
-	fi
-	ok=0
-	for l in $supported_wings_locales; do
-		if test "$l" = "$lang"; then
-			ok=1
-			break
-		fi
-	done
-	if test "$ok" = 1; then
-		WINGSMOFILES="$WINGSMOFILES $lang.mo"
-	fi
+for lang in $supported_locales; do
+       MOFILES="$MOFILES $lang.mo"
 done
 
+for lang in $supported_wprefs_locales; do
+       WPMOFILES="$WPMOFILES $lang.mo"
+done
 
+for lang in $supported_wings_locales; do
+       WINGSMOFILES="$WINGSMOFILES $lang.mo"
+done
 
 case $host_os in
 	freebsd*)
@@ -26060,8 +26035,8 @@ _ACEOF
     fi
 fi
 
-LIBRARY_SEARCH_PATH="$lib_search_path"
-HEADER_SEARCH_PATH="$inc_search_path"
+LIBRARY_SEARCH_PATH="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib"
+HEADER_SEARCH_PATH="-I${BUILDLINK_DIR}/include -I${BUILDLINK_X11_DIR}/include"
 
 
 
@@ -27661,7 +27636,7 @@ cat <<EOF >get-wraster-flags
 
 WCFLAGS="$inc_search_path"
 WLFLAGS="$lib_search_path"
-WLIBS="-lwraster $GFXLIBS $XLIBS -lm"
+WLIBS="-lwraster $GFXLIBS $XLIBS $XFTLIBS -lm"
 
 usage="Usage: get-wraster-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#"