--- configure.ac.orig	2010-03-17 23:43:24.000000000 +0200
+++ configure.ac	2010-04-20 22:11:51.000000000 +0300
@@ -70,7 +70,14 @@
 This drawing library can be downloaded at http://www.boutell.com/gd])])
 AC_CHECK_LIB([kpathsea], [kpse_set_program_name],, 
              AC_MSG_ERROR([cannot find/use libkpathsea]))
+
+AC_ARG_ENABLE(t1lib, AS_HELP_STRING([--disable-t1lib], []), [check_t1=$enableval], [check_t1=yes])
+
+if test "$check_t1" = yes; then
 AC_CHECK_LIB([t1], [T1_InitLib])
+AC_CHECK_HEADERS([t1lib.h])
+fi
+
 PSFONTS_O=""
 if test "$ac_cv_lib_t1_T1_InitLib" = yes; then
   PSFONTS_O="t1.o"
@@ -81,13 +88,18 @@
 AC_HEADER_STDC
 AC_CHECK_HEADERS([gd.h png.h kpathsea/kpathsea.h],,
 		 [AC_MSG_ERROR([cannot find/use $ac_header])])
-AC_CHECK_HEADERS([t1lib.h libgen.h])
+AC_CHECK_HEADERS([libgen.h])
+
+AC_ARG_ENABLE(freetype, AS_HELP_STRING([--disable-freetype], []), [check_ft=$enableval], [check_ft=yes])
+
+if test "$check_ft" = yes; then
 AC_CHECK_FT2(,[CFLAGS="$FT2_CFLAGS $CFLAGS"
 	LIBS="$FT2_LIBS $LIBS"
 	PSFONTS_O="$PSFONTS_O sfd.o ft.o"	
 	AC_DEFINE(HAVE_FT2, 1, [Define to 1 if you have freetype2])
 	ac_have_freetype2="yes"],
 	[ac_have_freetype2="no"])
+fi
 if test -n "$PSFONTS_O"; then
   PSFONTS_O="$PSFONTS_O enc.o fontmap.o tfm.o"
 fi