diff -purN fontconfig-2.8.0.orig/configure fontconfig-2.8.0/configure --- fontconfig-2.8.0.orig/configure 2009-12-17 13:17:26.000000000 +0100 +++ fontconfig-2.8.0/configure 2009-12-17 13:21:58.000000000 +0100 @@ -13720,70 +13720,8 @@ _ACEOF # -# Check whether --with-freetype-config was given. -if test "${with_freetype_config+set}" = set; then - withval=$with_freetype_config; freetype_config=$withval -else - freetype_config=yes -fi - - -if test "$freetype_config" = "yes"; then - # Extract the first word of "freetype-config", so it can be a program name with args. -set dummy freetype-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ft_config+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $ft_config in - [\\/]* | ?:[\\/]*) - ac_cv_path_ft_config="$ft_config" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ft_config="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_ft_config" && ac_cv_path_ft_config="no" - ;; -esac -fi -ft_config=$ac_cv_path_ft_config -if test -n "$ft_config"; then - { $as_echo "$as_me:$LINENO: result: $ft_config" >&5 -$as_echo "$ft_config" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "$ft_config" = "no"; then - { { $as_echo "$as_me:$LINENO: error: You must have freetype installed; see http://www.freetype.org/" >&5 -$as_echo "$as_me: error: You must have freetype installed; see http://www.freetype.org/" >&2;} - { (exit 1); exit 1; }; } - fi -else - ft_config="$freetype_config" -fi - -FREETYPE_CFLAGS="`$ft_config --cflags`" -FREETYPE_LIBS="`$ft_config --libs`" - - - +FREETYPE_CFLAGS="-I/usr/include/freetype2" +FREETYPE_LIBS="-lfreetype -lz" fontconfig_save_libs="$LIBS" fontconfig_save_cflags="$CFLAGS"