diff -uraN gs-orig/src/configure.ac gs-freetype/src/configure.ac
--- gs-orig/src/configure.ac	2007-04-26 19:37:24.000000000 +0100
+++ gs-freetype/src/configure.ac	2007-04-27 22:48:41.000000000 +0100
@@ -494,6 +494,50 @@
 AC_SUBST(SHARE_JASPER)
 AC_SUBST(JPXDEVS)
 
+dnl check for system freetype vs. freetype source tree
+HAVE_FREETYPE=""
+AC_ARG_WITH([freetype], AC_HELP_STRING([--with-freetype=x], [Location of freetype source (uses installed version if not given))]))
+if test "x$with_freetype" = "x" -o "x$with_freetype" = "xyes"; then
+	AC_PATH_PROG(FREETYPECONFIG, freetype-config)
+	if test "x$FREETYPECONFIG" != x; then
+		AC_DEFINE(HAVE_FREETYPE)
+
+		SAVE_CPPFLAGS="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS `$FREETYPECONFIG --cflags`"
+		AC_CHECK_HEADERS([ft2build.h])
+		CPPFLAGS="$SAVE_CPPFLAGS"
+
+		FT_ROOT=""
+		FT_LIB="freetype"
+		FT_INC="`$FREETYPECONFIG --cflags`"
+		FT_LINK="-lib \$(FT_LIB)"
+		FT_DEPS=""
+		FT_HDEPS=""
+	fi
+else
+	# Freetype directory was given
+	if ! test -d "$with_freetype"; then
+		AC_MSG_ERROR([Invalid use of --with-freetype. Use --with-freetype=/path/to/freetype/sources or --with-freetype (to use an installed version)])
+	fi
+	AC_DEFINE(HAVE_FREETYPE)
+	FT_ROOT="$with_freetype"
+	FT_LIB='$(FT_ROOT)$(D)objs$(D)freetype214MT_D'
+	FT_INC='$(I_)$(FT_ROOT)$(D)include$(_I)'
+	FT_LINK='-link \$(FT_LIB)\$(FT_LIB_EXT)'
+	FT_DEPS='$(FT_LIB)$(FT_LIB_EXT)'
+	FT_HDEPS='$(FT_ROOT)$(D)include$(D)freetype$(D)freetype.h \\\
+ $(FT_ROOT)$(D)include$(D)freetype$(D)ftincrem.h \\\
+ $(FT_ROOT)$(D)include$(D)freetype$(D)ftglyph.h \\\
+ $(FT_ROOT)$(D)include$(D)freetype$(D)ftoutln.h \\\
+ $(FT_ROOT)$(D)include$(D)freetype$(D)fttrigon.h'
+fi
+AC_SUBST(FT_ROOT)
+AC_SUBST(FT_LIB)
+AC_SUBST(FT_INC)
+AC_SUBST(FT_LINK)
+AC_SUBST(FT_DEPS)
+AC_SUBST(FT_HDEPS)
+
 dnl look for omni implementation
 AC_ARG_WITH([omni], AC_HELP_STRING([--with-omni],
 	[build the omni driver]))