blob: 530c9a8d220c980fe02e63a942484c74034b38e1 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- configure.bak Fri Feb 6 09:19:49 2004
+++ configure Wed Apr 21 16:47:25 2004
@@ -23161,6 +23161,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -37277,10 +37278,10 @@
done
if test -n "$freetype_config"
then
- freetype_prefix=`freetype-config --prefix`
- freetype_exec_prefix=`freetype-config --exec-prefix`
- LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
- CPPFLAGS="-I${freetype_prefix}/include/freetype2 $CPPFLAGS"
+ freetype_cflags=`$freetype_config --cflags`
+ freetype_libs=`$freetype_config --libs`
+ LDFLAGS="$LDFLAGS $freetype_libs"
+ CPPFLAGS="$freetype_cflags $CPPFLAGS"
fi
fi
@@ -37621,10 +37622,10 @@
done
if test -n "$freetype_config"
then
- freetype_prefix=`freetype-config --prefix`
- freetype_exec_prefix=`freetype-config --exec-prefix`
- LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
- CPPFLAGS="-I${freetype_prefix}/include/freetype2 $CPPFLAGS"
+ freetype_cflags=`$freetype_config --cflags`
+ freetype_libs=`$freetype_config --libs`
+ LDFLAGS="$LDFLAGS $freetype_libs"
+ CPPFLAGS="$freetype_cflags $CPPFLAGS"
fi
fi
@@ -37906,7 +37907,7 @@
fi
- if test "$have_freetype_h" = 'yes'
+ if test "$ac_cv_header_ft2build_h" = 'yes' || test "$have_freetype_h" = 'yes'
then
passed=`expr $passed + 1`
else
|
