third_party/libxml/src/aclocal.m4 - Issue 1977213002: Roll libxml to 8effcb578e0590cc01bbcab0f9dccefc6bdbcdbd

Unified Diff: third_party/libxml/src/aclocal.m4

Issue 1977213002: Roll libxml to 8effcb578e0590cc01bbcab0f9dccefc6bdbcdbd (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update README.chromium. Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: third_party/libxml/src/aclocal.m4

diff --git a/third_party/libxml/src/aclocal.m4 b/third_party/libxml/src/aclocal.m4

index 11ea66b4acacb2add53451c6afe62e3b8a9cfe09..7f2a60786bfa68f3d26bd51e26fb3f2bdf5c6e67 100644

--- a/third_party/libxml/src/aclocal.m4

+++ b/third_party/libxml/src/aclocal.m4

@@ -1,6 +1,6 @@

-# generated automatically by aclocal 1.15 -*- Autoconf -*-

+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -180,62 +180,7 @@ else

fi[]dnl

])# PKG_CHECK_MODULES

-# PKG_INSTALLDIR(DIRECTORY)

-# -------------------------

-# Substitutes the variable pkgconfigdir as the location where a module

-# should install pkg-config .pc files. By default the directory is

-# $libdir/pkgconfig, but the default can be changed by passing

-# DIRECTORY. The user can override through the --with-pkgconfigdir

-# parameter.

-AC_DEFUN([PKG_INSTALLDIR],

-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])

-m4_pushdef([pkg_description],

- [pkg-config installation directory @<:@]pkg_default[@:>@])

-AC_ARG_WITH([pkgconfigdir],

- [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,

- [with_pkgconfigdir=]pkg_default)

-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])

-m4_popdef([pkg_default])

-m4_popdef([pkg_description])

-]) dnl PKG_INSTALLDIR

-# PKG_NOARCH_INSTALLDIR(DIRECTORY)

-# -------------------------

-# Substitutes the variable noarch_pkgconfigdir as the location where a

-# module should install arch-independent pkg-config .pc files. By

-# default the directory is $datadir/pkgconfig, but the default can be

-# changed by passing DIRECTORY. The user can override through the

-# --with-noarch-pkgconfigdir parameter.

-AC_DEFUN([PKG_NOARCH_INSTALLDIR],

-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])

-m4_pushdef([pkg_description],

- [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])

-AC_ARG_WITH([noarch-pkgconfigdir],

- [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,

- [with_noarch_pkgconfigdir=]pkg_default)

-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])

-m4_popdef([pkg_default])

-m4_popdef([pkg_description])

-]) dnl PKG_NOARCH_INSTALLDIR

-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,

-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])

-# -------------------------------------------

-# Retrieves the value of the pkg-config variable for the given module.

-AC_DEFUN([PKG_CHECK_VAR],

-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl

-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl

-_PKG_CONFIG([$1], [variable="][$3]["], [$2])

-AS_VAR_COPY([$1], [pkg_cv_][$1])

-AS_VAR_IF([$1], [""], [$5], [$4])dnl

-])# PKG_CHECK_VAR

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -247,10 +192,10 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl

# generated from the m4 files accompanying Automake X.Y.

# (This private macro should not be called outside this file.)

AC_DEFUN([AM_AUTOMAKE_VERSION],

-[am__api_version='1.15'

+[am__api_version='1.14'

dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

dnl require some minimum version. Point them to the right macro.

-m4_if([$1], [1.15], [],

+m4_if([$1], [1.14.1], [],

[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

])

@@ -266,14 +211,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])

# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.15])dnl

+[AM_AUTOMAKE_VERSION([1.14.1])dnl

m4_ifndef([AC_AUTOCONF_VERSION],

[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

# AM_AUX_DIR_EXPAND -*- Autoconf -*-

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -318,14 +263,15 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

# configured tree to be moved without reconfiguration.

AC_DEFUN([AM_AUX_DIR_EXPAND],

-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl

-# Expand $ac_aux_dir to an absolute path.

-am_aux_dir=`cd "$ac_aux_dir" && pwd`

+[dnl Rely on autoconf to set up CDPATH properly.

+AC_PREREQ([2.50])dnl

+# expand $ac_aux_dir to an absolute path

+am_aux_dir=`cd $ac_aux_dir && pwd`

])

# AM_CONDITIONAL -*- Autoconf -*-

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -356,7 +302,7 @@ AC_CONFIG_COMMANDS_PRE(

Usually this means the macro was only invoked conditionally.]])

fi])])

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -547,7 +493,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl

# Generate code to set up dependency tracking. -*- Autoconf -*-

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -623,7 +569,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],

# Do all the work for Automake. -*- Autoconf -*-

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -713,8 +659,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl

# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>

# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>

AC_SUBST([mkdir_p], ['$(MKDIR_P)'])

-# We need awk for the "check" target (and possibly the TAP driver). The

-# system "awk" is bad on some platforms.

+# We need awk for the "check" target. The system "awk" is bad on

+# some platforms.

AC_REQUIRE([AC_PROG_AWK])dnl

AC_REQUIRE([AC_PROG_MAKE_SET])dnl

AC_REQUIRE([AM_SET_LEADING_DOT])dnl

@@ -787,11 +733,7 @@ to "yes", and re-run configure.

END

AC_MSG_ERROR([Your 'rm' program is bad, sorry.])

-fi

-dnl The trailing newline in this macro's definition is deliberate, for

-dnl backward compatibility and to allow trailing 'dnl'-style comments

-dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.

-])

+fi])

dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not

dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further

@@ -820,7 +762,7 @@ for _am_header in $config_headers :; do

done

echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -831,7 +773,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co

# Define $install_sh.

AC_DEFUN([AM_PROG_INSTALL_SH],

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

-if test x"${install_sh+set}" != xset; then

+if test x"${install_sh}" != xset; then

case $am_aux_dir in

*\ * | *\ *)

install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

@@ -841,7 +783,7 @@ if test x"${install_sh+set}" != xset; then

AC_SUBST([install_sh])])

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -860,9 +802,45 @@ fi

rmdir .tst 2>/dev/null

AC_SUBST([am__leading_dot])])

+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-

+# From Jim Meyering

+# This file is free software; the Free Software Foundation

+# gives unlimited permission to copy and/or distribute it,

+# with or without modifications, as long as this notice is preserved.

+# AM_MAINTAINER_MODE([DEFAULT-MODE])

+# ----------------------------------

+# Control maintainer-specific portions of Makefiles.

+# Default is to disable them, unless 'enable' is passed literally.

+# For symmetry, 'disable' may be passed as well. Anyway, the user

+# can override the default with the --enable/--disable switch.

+AC_DEFUN([AM_MAINTAINER_MODE],

+[m4_case(m4_default([$1], [disable]),

+ [enable], [m4_define([am_maintainer_other], [disable])],

+ [disable], [m4_define([am_maintainer_other], [enable])],

+ [m4_define([am_maintainer_other], [enable])

+ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])

+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])

+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed

+ AC_ARG_ENABLE([maintainer-mode],

+ [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],

+ am_maintainer_other[ make rules and dependencies not useful

+ (and sometimes confusing) to the casual installer])],

+ [USE_MAINTAINER_MODE=$enableval],

+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))

+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])

+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])

+ MAINT=$MAINTAINER_MODE_TRUE

+ AC_SUBST([MAINT])dnl

# Check to see how 'make' treats includes. -*- Autoconf -*-

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -912,7 +890,7 @@ rm -f confinc confmf

# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -951,7 +929,7 @@ fi

# Helper functions for option handling. -*- Autoconf -*-

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -980,7 +958,7 @@ AC_DEFUN([_AM_SET_OPTIONS],

AC_DEFUN([_AM_IF_OPTION],

[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -1027,7 +1005,7 @@ AC_LANG_POP([C])])

# For backward compatibility.

AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -1046,7 +1024,7 @@ AC_DEFUN([AM_RUN_LOG],

# Check to make sure that the build environment is sane. -*- Autoconf -*-

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -1127,7 +1105,7 @@ AC_CONFIG_COMMANDS_PRE(

rm -f conftest.file

])

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -1187,7 +1165,7 @@ AC_SUBST([AM_BACKSLASH])dnl

_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl

])

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -1215,7 +1193,7 @@ fi

INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

AC_SUBST([INSTALL_STRIP_PROGRAM])])

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -1234,7 +1212,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

# Check how to create a tarball. -*- Autoconf -*-

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

« third_party/libxml/src/COPYING ('K') | « third_party/libxml/src/NEWS ('k') | third_party/libxml/src/bakefile/Bakefiles.bkgen » ('j') | no next file with comments »