summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-03-26 08:26:36 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-03-26 08:26:36 +0000
commit06e804d03b4cdf46019c05bcddfa1d44605b5df6 (patch)
treeb767af28a0bf13a5cf951f456df69277325eaf23 /Build/source/m4
parenta1fd87d351588b19714fe2dce7ff388e460a84d0 (diff)
Build system: Drop erroneous dependencies between libraries
git-svn-id: svn://tug.org/texlive/trunk@36630 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog5
-rw-r--r--Build/source/m4/kpse-graphite2-flags.m42
-rw-r--r--Build/source/m4/kpse-icu-flags.m46
3 files changed, 7 insertions, 6 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index a0bf42795c8..b10724a370e 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-26 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-graphite2-flags.m4: Does not depend on other libraries.
+ * kpse-icu-flags.m4: Drop handling of a historic bug from V4.4.
+
2015-03-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-{kpathsea,ptexenc}-flags.m4: Use pkg-config.
diff --git a/Build/source/m4/kpse-graphite2-flags.m4 b/Build/source/m4/kpse-graphite2-flags.m4
index aae7c0b3f7f..c6f88903418 100644
--- a/Build/source/m4/kpse-graphite2-flags.m4
+++ b/Build/source/m4/kpse-graphite2-flags.m4
@@ -12,8 +12,6 @@
# Set the make variables GRAPHITE2_INCLUDES and GRAPHITE2_LIBS to the CPPFLAGS and
# LIBS required for the `-lgraphite2' library in libs/graphite2/ of the TL tree.
AC_DEFUN([KPSE_GRAPHITE2_FLAGS], [dnl
-AC_REQUIRE([KPSE_FREETYPE2_FLAGS])[]dnl
-AC_REQUIRE([KPSE_ICU_FLAGS])[]dnl
_KPSE_LIB_FLAGS([graphite2], [graphite2], [],
[-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC],
[BLD/libs/graphite2/libgraphite2.a], [],
diff --git a/Build/source/m4/kpse-icu-flags.m4 b/Build/source/m4/kpse-icu-flags.m4
index 75cf28e3490..337c6b68660 100644
--- a/Build/source/m4/kpse-icu-flags.m4
+++ b/Build/source/m4/kpse-icu-flags.m4
@@ -1,5 +1,5 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -51,10 +51,8 @@ AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
AC_CHECK_TOOL([ICU_CONFIG], [icu-config], [false])[]dnl
if $ICU_CONFIG --version >/dev/null 2>&1; then
ICU_INCLUDES=`$ICU_CONFIG --cppflags`
- # Work around bug in icu-config version 4.4
ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath m4_ifset([kpse_icu_config_args],
- [kpse_icu_config_args])`
- ICU_LIBS="$ICU_LIBS `$ICU_CONFIG --ldflags-libsonly --ldflags-system`"
+ [kpse_icu_config_args ])--ldflags-libsonly --ldflags-system`
elif test "x$need_icu:$with_system_icu" = xyes:yes; then
AC_MSG_ERROR([did not find icu-config required for system icu libraries])
fi