Merged trunk changes r9797:9829 into 217update branch.
--- poppler-0.4.2/configure.ac-orig 2005-09-30 19:13:25.730836000 -0500
+++ poppler-0.4.2/configure.ac 2005-09-30 19:14:14.735419000 -0500
@@ -173,6 +173,7 @@
fi
+FREETYPE_CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)