summaryrefslogtreecommitdiff
path: root/Build/source/m4/kpse-icu-flags.m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-12-29 14:32:45 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-12-29 14:32:45 +0000
commit9da2af345bbc3848d181319a77b830c77034ae1e (patch)
tree74832eb1c57486b7ce18e0d987150cbdf42876a9 /Build/source/m4/kpse-icu-flags.m4
parenta7c9a7ff1a6d0925eafe21175304c494e266b319 (diff)
build system: Enable "silent rules" (see Automake manual)
git-svn-id: svn://tug.org/texlive/trunk@28654 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4/kpse-icu-flags.m4')
-rw-r--r--Build/source/m4/kpse-icu-flags.m443
1 files changed, 17 insertions, 26 deletions
diff --git a/Build/source/m4/kpse-icu-flags.m4 b/Build/source/m4/kpse-icu-flags.m4
index 2aa19738777..b7b653ec446 100644
--- a/Build/source/m4/kpse-icu-flags.m4
+++ b/Build/source/m4/kpse-icu-flags.m4
@@ -1,12 +1,10 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 0
-
# KPSE_ICU_FLAGS([MORE-ICU-LIBS], [ICU_CONFIG_ARGS])
# --------------------------------------------------
# Provide the configure option '--with-system-icu' (if in the TL tree).
@@ -35,29 +33,30 @@ AC_DEFUN([KPSE_ICU_XETEX_FLAGS],
#
# LIBNAME and OPTIONS as for _KPSE_LIB_FLAGS().
# MORE-ICU-LIBS: icu libraries from the TL tree in addition to icuuc and icudata.
-m4_define([_KPSE_ICU_FLAGS],
-[_KPSE_LIB_FLAGS([icu], [$1], [$2],
- [-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include],
- m4_bpatsubst([$3 icuuc icudata],
- [icu\([18a-z]*\)],
- [BLD/libs/icu/icu-build/lib/libicu\1.a]),
- [],
- [], [${top_builddir}/../../libs/icu/include/unicode/uversion.h])[]dnl
+m4_define([_KPSE_ICU_FLAGS], [dnl
+_KPSE_LIB_FLAGS([icu], [$1], [$2],
+ [-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include],
+ m4_bpatsubst([$3 icuuc icudata],
+ [icu\([18a-z]*\)],
+ [BLD/libs/icu/icu-build/lib/libicu\1.a]),
+ [],
+ [], [${top_builddir}/../../libs/icu/include/unicode/uversion.h])[]dnl
]) # _KPSE_ICU_FLAGS
# KPSE_ICU_OPTIONS([WITH-SYSTEM])
# -------------------------------
-AC_DEFUN([KPSE_ICU_OPTIONS],
-[m4_ifval([$1],
- [AC_ARG_WITH([system-icu],
- AS_HELP_STRING([--with-system-icu],
- [use installed ICU headers and libraries (requires icu-config, not for XeTeX)]))])[]dnl
+AC_DEFUN([KPSE_ICU_OPTIONS], [dnl
+m4_ifval([$1],
+ [AC_ARG_WITH([system-icu],
+ AS_HELP_STRING([--with-system-icu],
+ [use installed ICU headers and libraries (requires icu-config, not for XeTeX)]))])[]dnl
]) # KPSE_ICU_OPTIONS
# KPSE_ICU_SYSTEM_FLAGS
# ---------------------
-AC_DEFUN([KPSE_ICU_SYSTEM_FLAGS],
-[AC_REQUIRE([_KPSE_CHECK_ICU_CONFIG])[]dnl
+AC_DEFUN([KPSE_ICU_SYSTEM_FLAGS], [dnl
+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
@@ -68,11 +67,3 @@ 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
]) # KPSE_ICU_SYSTEM_FLAGS
-
-# _KPSE_CHECK_ICU_CONFIG
-# ----------------------
-# Check for icu-config
-AC_DEFUN([_KPSE_CHECK_ICU_CONFIG],
-[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
-AC_CHECK_TOOL([ICU_CONFIG], [icu-config], [false])[]dnl
-]) # _KPSE_CHECK_ICU_CONFIG