| 1 | diff -purN fontconfig-2.8.0.orig/configure fontconfig-2.8.0/configure |
| 2 | --- fontconfig-2.8.0.orig/configure 2009-12-17 13:17:26.000000000 +0100 |
| 3 | +++ fontconfig-2.8.0/configure 2009-12-17 13:21:58.000000000 +0100 |
| 4 | @@ -13720,70 +13720,8 @@ _ACEOF |
| 5 | # |
| 6 | |
| 7 | |
| 8 | -# Check whether --with-freetype-config was given. |
| 9 | -if test "${with_freetype_config+set}" = set; then |
| 10 | - withval=$with_freetype_config; freetype_config=$withval |
| 11 | -else |
| 12 | - freetype_config=yes |
| 13 | -fi |
| 14 | - |
| 15 | - |
| 16 | -if test "$freetype_config" = "yes"; then |
| 17 | - # Extract the first word of "freetype-config", so it can be a program name with args. |
| 18 | -set dummy freetype-config; ac_word=$2 |
| 19 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 20 | -$as_echo_n "checking for $ac_word... " >&6; } |
| 21 | -if test "${ac_cv_path_ft_config+set}" = set; then |
| 22 | - $as_echo_n "(cached) " >&6 |
| 23 | -else |
| 24 | - case $ft_config in |
| 25 | - [\\/]* | ?:[\\/]*) |
| 26 | - ac_cv_path_ft_config="$ft_config" # Let the user override the test with a path. |
| 27 | - ;; |
| 28 | - *) |
| 29 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 30 | -for as_dir in $PATH |
| 31 | -do |
| 32 | - IFS=$as_save_IFS |
| 33 | - test -z "$as_dir" && as_dir=. |
| 34 | - for ac_exec_ext in '' $ac_executable_extensions; do |
| 35 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 36 | - ac_cv_path_ft_config="$as_dir/$ac_word$ac_exec_ext" |
| 37 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 38 | - break 2 |
| 39 | - fi |
| 40 | -done |
| 41 | -done |
| 42 | -IFS=$as_save_IFS |
| 43 | - |
| 44 | - test -z "$ac_cv_path_ft_config" && ac_cv_path_ft_config="no" |
| 45 | - ;; |
| 46 | -esac |
| 47 | -fi |
| 48 | -ft_config=$ac_cv_path_ft_config |
| 49 | -if test -n "$ft_config"; then |
| 50 | - { $as_echo "$as_me:$LINENO: result: $ft_config" >&5 |
| 51 | -$as_echo "$ft_config" >&6; } |
| 52 | -else |
| 53 | - { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 54 | -$as_echo "no" >&6; } |
| 55 | -fi |
| 56 | - |
| 57 | - |
| 58 | - if test "$ft_config" = "no"; then |
| 59 | - { { $as_echo "$as_me:$LINENO: error: You must have freetype installed; see http://www.freetype.org/" >&5 |
| 60 | -$as_echo "$as_me: error: You must have freetype installed; see http://www.freetype.org/" >&2;} |
| 61 | - { (exit 1); exit 1; }; } |
| 62 | - fi |
| 63 | -else |
| 64 | - ft_config="$freetype_config" |
| 65 | -fi |
| 66 | - |
| 67 | -FREETYPE_CFLAGS="`$ft_config --cflags`" |
| 68 | -FREETYPE_LIBS="`$ft_config --libs`" |
| 69 | - |
| 70 | - |
| 71 | - |
| 72 | +FREETYPE_CFLAGS="-I/usr/include/freetype2" |
| 73 | +FREETYPE_LIBS="-lfreetype -lz" |
| 74 | |
| 75 | fontconfig_save_libs="$LIBS" |
| 76 | fontconfig_save_cflags="$CFLAGS" |