--- a/Makefile.am	Sun Sep 24 09:09:07 2006 +0000
+++ b/Makefile.am	Sun Sep 24 09:20:03 2006 +0000
@@ -1,5 +1,6 @@ LDADD=@LIBOBJS@
-LDADD=@LIBOBJS@
+LDADD=@LIBOBJS@ ${FT2_LIBS}
 DEFS = @DEFS@ -DDATADIR=\"$(pkgdatadir)\" -I. -I$(srcdir) -I.
+AM_CFLAGS=${FT2_CFLAGS}
 
 SUBDIRS=. cid
 

--- a/configure.in	Sun Sep 24 09:09:07 2006 +0000
+++ b/configure.in	Sun Sep 24 09:20:03 2006 +0000
@@ -1,58 +1,14 @@ AC_INIT(write_t42.c)
-AC_INIT(write_t42.c)
-AM_INIT_AUTOMAKE(ttftot42, 0.3d+)
-AM_CONFIG_HEADER(config.h)
+AC_INIT([ttftot42], [0.3d+], [nih@giga.or.at])
+AC_CONFIG_SRCDIR([write_t42.c])
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([foreign])
 
-AC_ARG_WITH(freetype,
-    [  --with-freetype=PREFIX  specify prefix for FreeType library],,
-    with_freetype=yes)
+AC_PROG_CC
 
-# We want these before the checks, so the checks can modify their values.
-test -z "$CFLAGS" && CFLAGS='-g -Wall' auto_cflags=1
-dnl test -z "$CFLAGS" && CFLAGS='-g -Wall -I/usr/local/include' auto_cflags=1
-dnl test -z "$LDFLAGS" && LDFLAGS='-L/usr/local/lib' auto_ldflags=1
-
-dnl AC_CANONICAL_HOST
-dnl AM_PROG_LIBTOOL
-AC_PROG_CC
-dnl AM_PROG_INSTALL
-
-if test "$with_freetype" = "no"
+AC_CHECK_FT2
+if test "$no_ft" = yes
 then
-	AC_MSG_ERROR(this program does not work without freetype)
-fi
-
-if test "$with_freetype" != "yes"
-then
-    if test -f "$with_freetype"/lib/freetype.h
-    then
-	# PREFIX is to uninstalled version in distribution directory
-	# XXX: check for newer versions of freetype
-	FREETYPE_INCLUDE="$with_freetype/lib"
-	LDFLAGS="$LDFLAGS -L$with_freetype/lib"
-    else
-	# PREFIX is installation prefix
-	FREETYPE_INCLUDE="$with_freetype/include"
-	LDFLAGS="$LDFLAGS -L$with_freetype/lib -Wl,-R$with_freetype/lib"
-    fi
-fi
-CFLAGS="$CFLAGS -I$FREETYPE_INCLUDE"
-
-
-AC_CHECK_LIB(ttf, TT_Open_Face)
-
-old_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I$FREETYPE_INCLUDE"
-AC_CHECK_HEADERS(freetype/freetype.h freetype.h)
-CPPFLAGS="$old_CPPFLAGS"
-
-if test "$ac_cv_lib_ttf_TT_Open_Face" != "yes"
-then
-    AC_MSG_ERROR(FreeType library not found -- cannot continue)
-fi
-if test "$ac_cv_header_freetype_freetype_h" != "yes" \
-   -a "$ac_cv_header_freetype_h" != "yes" 
-then
-    AC_MSG_ERROR(FreeType includes not found -- cannot continue)
+    AC_MSG_ERROR([freetype is required for this program])
 fi
 
 AC_CHECK_HEADERS(libgen.h)