blob: 31fbca576bd3df44e40217412fe0df83496e0ecf (
plain)
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
|
--- configure.orig 2015-04-12 11:22:39 UTC
+++ configure
@@ -1033,6 +1033,8 @@ with_system_poppler
with_system_xpdf
with_system_zziplib
with_system_teckit
+with_teckit_includes
+with_teckit_libdir
with_system_icu
with_system_graphite2
with_system_harfbuzz
@@ -24071,17 +24073,33 @@ fi
## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
-# Check whether --with-system-teckit was given.
+# Check whether --with-teckit-includes was given.
+if test "${with_teckit_includes+set}" = set; then :
+ withval=$with_teckit_includes;
+fi
+
+# Check whether --with-teckit-libdir was given.
+if test "${with_teckit_libdir+set}" = set; then :
+ withval=$with_teckit_libdir;
+fi
if test "${with_system_teckit+set}" = set; then :
withval=$with_system_teckit;
fi
if test "x$with_system_teckit" = xyes; then
- if $PKG_CONFIG teckit; then
- TECKIT_INCLUDES=`$PKG_CONFIG teckit --cflags`
- TECKIT_LIBS=`$PKG_CONFIG teckit --libs`
-elif test "x$need_teckit:$with_system_teckit" = xyes:yes; then
- as_fn_error $? "did not find teckit" "$LINENO" 5
-fi
+ if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then
+ TECKIT_INCLUDES="-I$with_mpfr_includes"
+ fi
+ if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then
+ TECKIT_LIBS="-L$with_teckit_libdir -lTECkit"
+ fi
+ if test "x$TECKIT_INCLUDES" = x && test "x$TECKIT_LIBS" = x; then
+ if $PKG_CONFIG teckit; then
+ TECKIT_INCLUDES=`$PKG_CONFIG teckit --cflags`
+ TECKIT_LIBS=`$PKG_CONFIG teckit --libs`
+ elif test "x$need_teckit:$with_system_teckit" = xyes:yes; then
+ as_fn_error $? "did not find teckit" "$LINENO" 5
+ fi
+ fi
else
TECKIT_INCLUDES="-I$kpse_BLD/libs/teckit/include"
TECKIT_LIBS="$kpse_BLD/libs/teckit/libTECkit.a"
|
