build system: Enable "silent rules" (see Automake manual)

git-svn-id: svn://tug.org/texlive/trunk@28654 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 76 insertions, 67 deletions

diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 4edee6fd6da..53dc5661db3 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -2,10 +2,23 @@
 
 	* kpse-pkgs.m4 (KPSE_UTILS_PKGS): add texdoctk.
 
+2012-12-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-freetype2-flags.m4: Only system lib uses freetype-config.
+	* kpse-icu-flags.m4: Only system lib uses icu-config.
+
 2012-12-16  Karl Berry  <karl@tug.org>
 
 	* kpse-pkgs.m4 (KPSE_TEXK_PKGS): no more tetex.
 
+2012-12-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-warnings.m4: Bug fix when KPSE_COMPILER_WARNINGS precedes
+	AC_PROG_CXX or similar.
+	* kpse-setup.m4: The default is to enable silent rules.
+	* kpse-common.m4: Factor out KPSE_BASIC fromm KPSE_COMMON and
+	enable silent rules.
+
 2012-12-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Add libs/graphite2 for future XeTeX.
diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4
index b5455deb334..983bd0610cc 100644
--- a/Build/source/m4/kpse-common.m4
+++ b/Build/source/m4/kpse-common.m4
@@ -202,18 +202,39 @@ eval CPPFLAGS=\"$[]AS_TR_CPP($1)_INCLUDES \$CPPFLAGS\"
 eval LIBS=\"$[]AS_TR_CPP($1)_LIBS \$LIBS\"
 ]) # KPSE_ADD_FLAGS
 
+# KPSE_BASIC(PACKAGE-NAME, [MORE-AUTOMAKE-OPTIONS])
+#--------------------------------------------------
+# Common Autoconf code for all libraries and programs.
+#
+# Initialization of Automake, compiler warnings, etc.
+AC_DEFUN([KPSE_BASIC], [dnl Remember PACKAGE-NAME as Kpse_Package (for future messages)
+m4_define([Kpse_Package], [$1])
+dnl
+AM_INIT_AUTOMAKE([foreign silent-rules]m4_ifval([$2], [ $2]))
+AM_MAINTAINER_MODE
+dnl
+dnl Check whether prototypes work.
+AC_CACHE_CHECK([whether the compiler accepts prototypes],
+               [kb_cv_c_prototypes],
+               [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]],
+                                                [[extern void foo(int i,...);]])],
+                               [kb_cv_c_prototypes=yes],
+                               [kb_cv_c_prototypes=no])])
+if test "x$kb_cv_c_prototypes" = xno; then
+  AC_MSG_ERROR([Sorry, your compiler does not understand prototypes.])
+fi
+dnl
+dnl Enable flags for compiler warnings
+KPSE_COMPILER_WARNINGS
+]) # KPSE_BASIC
+
 # KPSE_COMMON(PACKAGE-NAME, [MORE-AUTOMAKE-OPTIONS])
 # --------------------------------------------------
 # Common Autoconf code for all programs using libkpathsea.
 # Originally written by Karl Berry as texk/kpathsea/common.ac.
 #
-# Initialization of Automake and Libtool, some common tests.
-AC_DEFUN([KPSE_COMMON],
-[dnl Remember PACKAGE-NAME as Kpse_Package (for future messages)
-m4_define([Kpse_Package], [$1])
-dnl
-AM_INIT_AUTOMAKE([foreign]m4_ifval([$2], [ $2]))
-AM_MAINTAINER_MODE
+AC_DEFUN([KPSE_COMMON], [dnl
+KPSE_BASIC($@)
 dnl
 LT_PREREQ([2.2.6])
 LT_INIT([win32-dll])
@@ -242,20 +263,6 @@ AS_CASE([:$ac_cv_c_int64_t:$ac_cv_c_int64_t:],
 dnl
 dnl Check whether struct stat provides high-res time.
 AC_CHECK_MEMBERS([struct stat.st_mtim])
-dnl
-dnl Check whether prototypes work.
-AC_CACHE_CHECK([whether the compiler accepts prototypes],
-               [kb_cv_c_prototypes],
-               [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]],
-                                                [[extern void foo(int i,...);]])],
-                               [kb_cv_c_prototypes=yes],
-                               [kb_cv_c_prototypes=no])])
-if test "x$kb_cv_c_prototypes" = xno; then
-  AC_MSG_ERROR([Sorry, your compiler does not understand prototypes.])
-fi
-dnl
-dnl Enable flags for compiler warnings
-KPSE_COMPILER_WARNINGS
 ]) # KPSE_COMMON
 
 # KPSE_MSG_WARN(PROBLEM)
diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4
index 18f0edaba5c..ce4da7a6ade 100644
--- a/Build/source/m4/kpse-freetype2-flags.m4
+++ b/Build/source/m4/kpse-freetype2-flags.m4
@@ -1,21 +1,18 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009, 2010 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_FREETYPE2_FLAGS
 # --------------------
 # Provide the configure option '--with-system-freetype2' (if in the TL tree).
 #
 # Set the make variables FREETYPE2_INCLUDES and FREETYPE2_LIBS to the CPPFLAGS and
 # LIBS required for the `-lfreetype' library in libs/freetype2/ of the TL tree.
-AC_DEFUN([KPSE_FREETYPE2_FLAGS],
-[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
-AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl
+AC_DEFUN([KPSE_FREETYPE2_FLAGS], [dnl
+AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
 _KPSE_LIB_FLAGS([freetype2], [freetype], [lt],
                 [-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2],
                 [BLD/libs/freetype2/libfreetype.la], [],
@@ -33,8 +30,9 @@ AC_DEFUN([KPSE_FREETYPE2_OPTIONS],
 
 # KPSE_FREETYPE2_SYSTEM_FLAGS
 # ---------------------------
-AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS],
-[AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl
+AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
+AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
 if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
   FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
   FREETYPE2_LIBS=`$FT2_CONFIG --libs`
@@ -42,11 +40,3 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
   AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
 fi
 ]) # KPSE_FREETYPE2_SYSTEM_FLAGS
-
-# _KPSE_CHECK_FT2_CONFIG
-# ----------------------
-# Check for freetype-config
-AC_DEFUN([_KPSE_CHECK_FT2_CONFIG],
-[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
-AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
-]) # _KPSE_CHECK_FT2_CONFIG
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
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index 46d74b9418a..5a4f60fc2e4 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -33,6 +33,10 @@ AS_CASE([$enable_largefile],
         [yes | no], [:],
         [enable_largefile=yes
          ac_configure_args="$ac_configure_args '--enable-largefile'"])
+AS_CASE([$enable_silent_rules],
+        [yes | no], [:],
+        [enable_silent_rules=yes
+         ac_configure_args="$ac_configure_args '--enable-silent-rules'"])
 AS_CASE([$enable_multiplatform],
         [yes | no], [:],
         [enable_multiplatform=$enable_native_texlive_build
diff --git a/Build/source/m4/kpse-warnings.m4 b/Build/source/m4/kpse-warnings.m4
index 763e0bb7373..34c52844551 100644
--- a/Build/source/m4/kpse-warnings.m4
+++ b/Build/source/m4/kpse-warnings.m4
@@ -17,19 +17,23 @@ dnl arrange that AC_PROG_CC uses _KPSE_WARNING_CFLAGS etc.
 AC_PROVIDE_IFELSE([AC_PROG_CC],
                   [_KPSE_WARNING_CFLAGS],
                   [m4_define([AC_PROG_CC],
-                             m4_defn([AC_PROG_CC])[_KPSE_WARNING_CFLAGS])])
+                             m4_defn([AC_PROG_CC])[_KPSE_WARNING_CFLAGS
+])])
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [_KPSE_WARNING_CXXFLAGS],
                   [m4_define([AC_PROG_CXX],
-                             m4_defn([AC_PROG_CXX])[_KPSE_WARNING_CXXFLAGS])])
+                             m4_defn([AC_PROG_CXX])[_KPSE_WARNING_CXXFLAGS
+])])
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
                   [_KPSE_WARNING_OBJCFLAGS],
                   [m4_define([AC_PROG_OBJC],
-                             m4_defn([AC_PROG_OBJC])[_KPSE_WARNING_OBJCFLAGS])])
+                             m4_defn([AC_PROG_OBJC])[_KPSE_WARNING_OBJCFLAGS
+])])
 AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
                   [_KPSE_WARNING_OBJCXXFLAGS],
                   [m4_define([AC_PROG_OBJCXX],
-                             m4_defn([AC_PROG_OBJCXX])[_KPSE_WARNING_OBJCXXFLAGS])])
+                             m4_defn([AC_PROG_OBJCXX])[_KPSE_WARNING_OBJCXXFLAGS
+])])
 ]) # KPSE_COMPILER_WARNINGS
 
 # _KPSE_COMPILER_WARNINGS_OPTION