summaryrefslogtreecommitdiff
path: root/Build/source/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-02-19 09:31:37 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-02-19 09:31:37 +0000
commitb3d5371919d86702e12560b756e016fa50d4f302 (patch)
treee3a2b1d0419dc23ccdfb1c7a5dba35ac8c3aff1a /Build/source/configure
parentea8fb06b7354090b299af352efc12765a158b4e7 (diff)
Build system: Update a few M4 macros
git-svn-id: svn://tug.org/texlive/trunk@36322 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/configure')
-rwxr-xr-xBuild/source/configure30
1 files changed, 7 insertions, 23 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 12eb19f6e5a..8c6b9e1aedd 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -896,8 +896,6 @@ enable_linked_scripts
with_system_harfbuzz
with_system_icu
with_system_teckit
-with_teckit_includes
-with_teckit_libdir
with_system_graphite2
with_system_zziplib
with_system_xpdf
@@ -1758,11 +1756,8 @@ Optional Packages:
pkg-config)
--with-system-icu use installed ICU headers and libraries (requires
icu-config)
- --with-system-teckit use installed teckit headers and library
- --with-teckit-includes=DIR
- teckit headers installed in DIR
- --with-teckit-libdir=DIR
- teckit library installed in DIR
+ --with-system-teckit use installed teckit headers and library (requires
+ pkg-config)
--with-system-graphite2 use installed graphite2 headers and library
(requires pkg-config)
--with-system-zziplib use installed zziplib headers and library (requires
@@ -5656,16 +5651,6 @@ fi
if test "${with_system_teckit+set}" = set; then :
withval=$with_system_teckit;
fi
-
-# 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 "x$with_system_teckit" = x; then
if test -f $srcdir/libs/teckit/configure; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
@@ -21316,12 +21301,11 @@ elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
as_fn_error $? "did not find graphite2" "$LINENO" 5
fi
-if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then
- TECKIT_INCLUDES="-I$with_teckit_includes"
-fi
-TECKIT_LIBS="-lTECkit"
-if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then
- TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS"
+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 -n "$ac_tool_prefix"; then