$NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $

--- configure.in.orig	Thu Dec 16 10:35:16 1999
+++ configure.in	Fri Aug  4 21:37:12 2000
@@ -305,7 +305,7 @@
 _SAVE_LDFLAGS=$LDFLAGS
 
 if test "$TTF_DIR" != "" ; then
-CFLAGS="-I${TTF_DIR}/include $CFLAGS"
+CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
 LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
 fi
 
@@ -319,20 +319,21 @@
     AC_MSG_RESULT("$result")
 fi
 if [ test "$SYSTEM_TTF" = 1 ]; then
-    AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
+    AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
+    no_ttf=yes,-lintl)
 else
     no_ttf=yes
 fi
 
 if [ test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ]; then
-    TTF_CFLAGS="-I${TTF_DIR}/include"
+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
     TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
 fi
 
 if test "x$no_ttf" = xyes; then
 	if test "$TTF_DIR" != "" ; then
-	CFLAGS="-I${TTF_DIR} $CFLAGS"
-	LDFLAGS="-L${TTF_DIR} $LDFLAGS"
+	CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
+	LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
 	fi
 
 	if test "$TTF_DIR" = no; then
@@ -345,15 +346,16 @@
 		AC_MSG_RESULT("$result")
 	fi
 	if [ test "$SYSTEM_TTF" = 1 ]; then
-		AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
+		AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
+		no_ttf=yes,-lintl)
 	else
 		no_ttf=yes
 	fi
 
 
 if [ test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ]; then
-    TTF_CFLAGS="-I${TTF_DIR}"
-    TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
+    TTF_LIBS="-L${TTF_DIR}/include ${TTF_LIBS}"
 fi
 
 fi
@@ -374,7 +376,7 @@
 _SAVE_LIBS=$LIBS
 
 if test "$WMF_DIR" != "" ; then
-CFLAGS="-I${WMF_DIR}/include $CFLAGS"
+CFLAGS="-I${WMF_DIR}/include/libwmf $CFLAGS"
 LDFLAGS="-L${WMF_DIR}/lib $LDFLAGS"
 fi
 
@@ -397,13 +399,13 @@
 fi
 
 if [ test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ]; then
-    WMF_CFLAGS="-I${WMF_DIR}/include"
+    WMF_CFLAGS="-I${WMF_DIR}/include/libwmf"
     WMF_LIBS="-L${WMF_DIR}/lib ${WMF_LIBS}"
 fi
 
 if test "x$no_wmf" = xyes; then
 	if test "$WMF_DIR" != "" ; then
-	CFLAGS="-I${WMF_DIR}/include $CFLAGS"
+	CFLAGS="-I${WMF_DIR}/include/libwmf $CFLAGS"
 	LDFLAGS="-L${WMF_DIR}/lib $LDFLAGS"
 	fi
 
@@ -427,8 +429,8 @@
 
 
 if [ test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ]; then
-    WMF_CFLAGS="-I${WMF_DIR}"
-    WMF_LIBS="-L${WMF_DIR} ${WMF_LIBS}"
+    WMF_CFLAGS="-I${WMF_DIR}/include/libwmf"
+    WMF_LIBS="-L${WMF_DIR}/lib ${WMF_LIBS}"
 fi
 
 fi