$NetBSD: patch-aa,v 1.3 2005/01/28 14:58:09 adam Exp $

--- configure.orig	2002-01-17 18:54:07.000000000 +0000
+++ configure
@@ -5412,14 +5412,14 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
 
 
 
-echo $ac_n "checking for poptParseArgvString in -lpopt""... $ac_c" 1>&6
-echo "configure:5417: checking for poptParseArgvString in -lpopt" >&5
+echo $ac_n "checking for poptParseArgvString in -lgnomesupport""... $ac_c" 1>&6
+echo "configure:5417: checking for poptParseArgvString in -lgnomesupport" >&5
 ac_lib_var=`echo popt'_'poptParseArgvString | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lpopt  $LIBS"
+LIBS="-lgnomesupport  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 5425 "configure"
 #include "confdefs.h"
@@ -5447,7 +5447,7 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  POPT_LIBS="-lpopt"
+  POPT_LIBS="-lgnomesupport"
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -6020,6 +6020,7 @@ else
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ft2build.h>
 #include <freetype/freetype.h>
 
 char*