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
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
$NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $
--- configure.in.orig Thu Dec 16 10:35:16 1999
+++ configure.in Fri Aug 4 21:37:12 2000
@@ -305,7 +305,7 @@
_SAVE_LDFLAGS=$LDFLAGS
if test "$TTF_DIR" != "" ; then
-CFLAGS="-I${TTF_DIR}/include $CFLAGS"
+CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
fi
@@ -319,20 +319,21 @@
AC_MSG_RESULT("$result")
fi
if [ test "$SYSTEM_TTF" = 1 ]; then
- AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
+ AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
+ no_ttf=yes,-lintl)
else
no_ttf=yes
fi
if [ test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ]; then
- TTF_CFLAGS="-I${TTF_DIR}/include"
+ TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
fi
if test "x$no_ttf" = xyes; then
if test "$TTF_DIR" != "" ; then
- CFLAGS="-I${TTF_DIR} $CFLAGS"
- LDFLAGS="-L${TTF_DIR} $LDFLAGS"
+ CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
+ LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
fi
if test "$TTF_DIR" = no; then
@@ -345,15 +346,16 @@
AC_MSG_RESULT("$result")
fi
if [ test "$SYSTEM_TTF" = 1 ]; then
- AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
+ AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
+ no_ttf=yes,-lintl)
else
no_ttf=yes
fi
if [ test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ]; then
- TTF_CFLAGS="-I${TTF_DIR}"
- TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
+ TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
+ TTF_LIBS="-L${TTF_DIR}/include ${TTF_LIBS}"
fi
fi
@@ -374,7 +376,7 @@
_SAVE_LIBS=$LIBS
if test "$WMF_DIR" != "" ; then
-CFLAGS="-I${WMF_DIR}/include $CFLAGS"
+CFLAGS="-I${WMF_DIR}/include/libwmf $CFLAGS"
LDFLAGS="-L${WMF_DIR}/lib $LDFLAGS"
fi
@@ -397,13 +399,13 @@
fi
if [ test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ]; then
- WMF_CFLAGS="-I${WMF_DIR}/include"
+ WMF_CFLAGS="-I${WMF_DIR}/include/libwmf"
WMF_LIBS="-L${WMF_DIR}/lib ${WMF_LIBS}"
fi
if test "x$no_wmf" = xyes; then
if test "$WMF_DIR" != "" ; then
- CFLAGS="-I${WMF_DIR}/include $CFLAGS"
+ CFLAGS="-I${WMF_DIR}/include/libwmf $CFLAGS"
LDFLAGS="-L${WMF_DIR}/lib $LDFLAGS"
fi
@@ -427,8 +429,8 @@
if [ test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ]; then
- WMF_CFLAGS="-I${WMF_DIR}"
- WMF_LIBS="-L${WMF_DIR} ${WMF_LIBS}"
+ WMF_CFLAGS="-I${WMF_DIR}/include/libwmf"
+ WMF_LIBS="-L${WMF_DIR}/lib ${WMF_LIBS}"
fi
fi
|
