aclocal.m4 - Issue 2364793002: Revert "Uprev libmtp to 1.1.12"

Unified Diff: aclocal.m4

Issue 2364793002: Revert "Uprev libmtp to 1.1.12" (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libmtp@master

Patch Set: Created 4 years, 3 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: aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4

index 857847ad81e324af3f534d1ca1b64541acb28935..aa40b32f1fdf7fc7a1e833076af61b8c883dc5e4 100644

--- a/aclocal.m4

+++ b/aclocal.m4

@@ -1,7 +1,8 @@

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

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

+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,

+# Inc.

# 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.

@@ -11,68 +12,61 @@

# even the implied warranty of MERCHANTABILITY or FITNESS FOR A

# PARTICULAR PURPOSE.

-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])

m4_ifndef([AC_AUTOCONF_VERSION],

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

-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,

-[m4_warning([this file was generated for autoconf 2.69.

+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,

+[m4_warning([this file was generated for autoconf 2.68.

You have another version of autoconf. It may work, but is not guaranteed to.

If you have problems, you may need to regenerate the build system entirely.

-To do so, use the procedure documented by the package, typically 'autoreconf'.])])

+To do so, use the procedure documented by the package, typically `autoreconf'.])])

-# lib-ld.m4 serial 6

+# lib-ld.m4 serial 4 (gettext-0.18)

dnl This file is free software; the Free Software Foundation

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

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

dnl Subroutines of libtool.m4,

-dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid

-dnl collision with libtool.m4.

+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision

+dnl with libtool.m4.

-dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.

+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.

AC_DEFUN([AC_LIB_PROG_LD_GNU],

[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],

-[# I'd rather use --version here, but apparently some GNU lds only accept -v.

+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.

case `$LD -v 2>&1 </dev/null` in

*GNU* | *'with BFD'*)

- acl_cv_prog_gnu_ld=yes

- ;;

+ acl_cv_prog_gnu_ld=yes ;;

- acl_cv_prog_gnu_ld=no

- ;;

+ acl_cv_prog_gnu_ld=no ;;

esac])

with_gnu_ld=$acl_cv_prog_gnu_ld

])

-dnl From libtool-2.4. Sets the variable LD.

+dnl From libtool-1.4. Sets the variable LD.

AC_DEFUN([AC_LIB_PROG_LD],

-[AC_REQUIRE([AC_PROG_CC])dnl

+[AC_ARG_WITH([gnu-ld],

+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],

+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)

+AC_REQUIRE([AC_PROG_CC])dnl

AC_REQUIRE([AC_CANONICAL_HOST])dnl

-AC_ARG_WITH([gnu-ld],

- [AS_HELP_STRING([--with-gnu-ld],

- [assume the C compiler uses GNU ld [default=no]])],

- [test "$withval" = no || with_gnu_ld=yes],

- [with_gnu_ld=no])dnl

# Prepare PATH_SEPARATOR.

# The user is always right.

if test "${PATH_SEPARATOR+set}" != set; then

- # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which

- # contains only /bin. Note that ksh looks also at the FPATH variable,

- # so we have to set that as well for the test.

- PATH_SEPARATOR=:

- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \

- && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \

- || PATH_SEPARATOR=';'

- }

+ echo "#! /bin/sh" >conf$$.sh

+ echo "exit 0" >>conf$$.sh

+ chmod +x conf$$.sh

+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

+ PATH_SEPARATOR=';'

+ else

+ PATH_SEPARATOR=:

+ fi

+ rm -f conf$$.sh

ac_prog=ld

if test "$GCC" = yes; then

# Check if gcc -print-prog-name=ld gives a path.

- AC_MSG_CHECKING([for ld used by $CC])

+ AC_MSG_CHECKING([for ld used by GCC])

case $host in

*-*-mingw*)

# gcc leaves a trailing carriage return which upsets mingw

@@ -82,11 +76,11 @@ if test "$GCC" = yes; then

esac

case $ac_prog in

# Accept absolute paths.

- [[\\/]]* | ?:[[\\/]]*)

- re_direlt='/[[^/]][[^/]]*/\.\./'

- # Canonicalize the pathname of ld

- ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`

- while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do

+ [[\\/]* | [A-Za-z]:[\\/]*)]

+ [re_direlt='/[^/][^/]*/\.\./']

+ # Canonicalize the path of ld

+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`

+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do

ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`

done

test -z "$LD" && LD="$ac_prog"

@@ -107,26 +101,23 @@ else

AC_CACHE_VAL([acl_cv_path_LD],

[if test -z "$LD"; then

- acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"

for ac_dir in $PATH; do

- IFS="$acl_save_ifs"

test -z "$ac_dir" && ac_dir=.

if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then

acl_cv_path_LD="$ac_dir/$ac_prog"

# Check to see if the program is GNU ld. I'd rather use --version,

- # but apparently some variants of GNU ld only accept -v.

+ # but apparently some GNU ld's only accept -v.

# Break only if it was the GNU/non-GNU ld that we prefer.

- case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in

+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in

*GNU* | *'with BFD'*)

- test "$with_gnu_ld" != no && break

- ;;

+ test "$with_gnu_ld" != no && break ;;

- test "$with_gnu_ld" != yes && break

- ;;

+ test "$with_gnu_ld" != yes && break ;;

esac

done

- IFS="$acl_save_ifs"

+ IFS="$ac_save_ifs"

else

acl_cv_path_LD="$LD" # Let the user override the test with a path.

fi])

@@ -140,8 +131,8 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])

AC_LIB_PROG_LD_GNU

])

-# lib-link.m4 serial 26 (gettext-0.18.2)

+# lib-link.m4 serial 21 (gettext-0.18)

dnl This file is free software; the Free Software Foundation

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

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

@@ -160,9 +151,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],

[

AC_REQUIRE([AC_LIB_PREPARE_PREFIX])

AC_REQUIRE([AC_LIB_RPATH])

- pushdef([Name],[m4_translit([$1],[./+-], [____])])

- pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],

- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])

+ pushdef([Name],[translit([$1],[./-], [___])])

+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],

+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])

AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [

AC_LIB_LINKFLAGS_BODY([$1], [$2])

ac_cv_lib[]Name[]_libs="$LIB[]NAME"

@@ -200,9 +191,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],

[

AC_REQUIRE([AC_LIB_PREPARE_PREFIX])

AC_REQUIRE([AC_LIB_RPATH])

- pushdef([Name],[m4_translit([$1],[./+-], [____])])

- pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],

- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])

+ pushdef([Name],[translit([$1],[./-], [___])])

+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],

+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])

dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME

dnl accordingly.

@@ -227,8 +218,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],

*" -l"*) LIBS="$LIBS $LIB[]NAME" ;;

*) LIBS="$LIB[]NAME $LIBS" ;;

esac

- AC_LINK_IFELSE(

- [AC_LANG_PROGRAM([[$3]], [[$4]])],

+ AC_TRY_LINK([$3], [$4],

[ac_cv_lib[]Name=yes],

[ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])

LIBS="$ac_save_LIBS"

@@ -258,8 +248,6 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],

dnl Determine the platform dependent parameters needed to use rpath:

dnl acl_libext,

dnl acl_shlibext,

-dnl acl_libname_spec,

-dnl acl_library_names_spec,

dnl acl_hardcode_libdir_flag_spec,

dnl acl_hardcode_libdir_separator,

dnl acl_hardcode_direct,

@@ -302,15 +290,15 @@ dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar

dnl macro call that searches for libname.

AC_DEFUN([AC_LIB_FROMPACKAGE],

[

- pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],

- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])

+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],

+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])

define([acl_frompackage_]NAME, [$2])

popdef([NAME])

pushdef([PACK],[$2])

- pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],

- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])

+ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],

+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])

define([acl_libsinpackage_]PACKUP,

- m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])

+ m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])

popdef([PACKUP])

popdef([PACK])

])

@@ -323,14 +311,14 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.

AC_DEFUN([AC_LIB_LINKFLAGS_BODY],

[

AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])

- pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],

- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])

+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],

+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])

pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])

- pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],

- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])

+ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],

+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])

pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])

dnl Autoconf >= 2.61 supports dots in --with options.

- pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])

+ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])

dnl By default, look in $includedir and $libdir.

use_additional=yes

AC_LIB_WITH_FINAL_PREFIX([

@@ -387,7 +375,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],

names_already_handled="$names_already_handled $name"

dnl See if it was already located by an earlier AC_LIB_LINKFLAGS

dnl or AC_LIB_HAVE_LINKFLAGS call.

- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`

+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`

eval value=\"\$HAVE_LIB$uppername\"

if test -n "$value"; then

if test "$value" = yes; then

@@ -919,7 +907,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],

])

# lib-prefix.m4 serial 7 (gettext-0.18)

dnl This file is free software; the Free Software Foundation

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

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

@@ -1143,67 +1131,35 @@ sixtyfour bits

test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"

])

-dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-

-dnl serial 11 (pkg-config-0.29.1)

-dnl

-dnl This program is free software; you can redistribute it and/or modify

-dnl it under the terms of the GNU General Public License as published by

-dnl the Free Software Foundation; either version 2 of the License, or

-dnl (at your option) any later version.

-dnl

-dnl This program is distributed in the hope that it will be useful, but

-dnl WITHOUT ANY WARRANTY; without even the implied warranty of

-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

-dnl General Public License for more details.

-dnl

-dnl You should have received a copy of the GNU General Public License

-dnl along with this program; if not, write to the Free Software

-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA

-dnl 02111-1307, USA.

-dnl

-dnl As a special exception to the GNU General Public License, if you

-dnl distribute this file as part of a program that contains a

-dnl configuration script generated by Autoconf, you may include it under

-dnl the same distribution terms that you use for the rest of that

-dnl program.

-dnl PKG_PREREQ(MIN-VERSION)

-dnl -----------------------

-dnl Since: 0.29

-dnl

-dnl Verify that the version of the pkg-config macros are at least

-dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's

-dnl installed version of pkg-config, this checks the developer's version

-dnl of pkg.m4 when generating configure.

-dnl

-dnl To ensure that this macro is defined, also add:

-dnl m4_ifndef([PKG_PREREQ],

-dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])

-dnl

-dnl See the "Since" comment for each macro you use to see what version

-dnl of the macros you require.

-m4_defun([PKG_PREREQ],

-[m4_define([PKG_MACROS_VERSION], [0.29.1])

-m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,

- [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])

-])dnl PKG_PREREQ

-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])

-dnl ----------------------------------

-dnl Since: 0.16

-dnl

-dnl Search for the pkg-config tool and set the PKG_CONFIG variable to

-dnl first found in the path. Checks that the version of pkg-config found

-dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is

-dnl used since that's the first version where most current features of

-dnl pkg-config existed.

+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-

+# serial 1 (pkg-config-0.24)

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+# This program is distributed in the hope that it will be useful, but

+# WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+# General Public License for more details.

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

+# As a special exception to the GNU General Public License, if you

+# distribute this file as part of a program that contains a

+# configuration script generated by Autoconf, you may include it under

+# the same distribution terms that you use for the rest of that program.

+# PKG_PROG_PKG_CONFIG([MIN-VERSION])

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

AC_DEFUN([PKG_PROG_PKG_CONFIG],

[m4_pattern_forbid([^_?PKG_[A-Z_]+$])

-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])

-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])

+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])

AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])

AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])

AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])

@@ -1221,19 +1177,18 @@ if test -n "$PKG_CONFIG"; then

PKG_CONFIG=""

fi[]dnl

-])dnl PKG_PROG_PKG_CONFIG

-dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])

-dnl -------------------------------------------------------------------

-dnl Since: 0.18

-dnl

-dnl Check to see whether a particular set of modules exists. Similar to

-dnl PKG_CHECK_MODULES(), but does not set variables or print errors.

-dnl

-dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])

-dnl only at the first occurence in configure.ac, so if the first place

-dnl it's called might be skipped (such as if it is within an "if", you

-dnl have to call PKG_CHECK_EXISTS manually

+])# PKG_PROG_PKG_CONFIG

+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])

+# Check to see whether a particular set of modules exists. Similar

+# to PKG_CHECK_MODULES(), but does not set variables or print errors.

+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])

+# only at the first occurence in configure.ac, so if the first place

+# it's called might be skipped (such as if it is within an "if", you

+# have to call PKG_CHECK_EXISTS manually

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

AC_DEFUN([PKG_CHECK_EXISTS],

[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl

if test -n "$PKG_CONFIG" && \

@@ -1243,26 +1198,22 @@ m4_ifvaln([$3], [else

$3])dnl

fi])

-dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])

-dnl ---------------------------------------------

-dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting

-dnl pkg_failed based on the result.

+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])

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

m4_define([_PKG_CONFIG],

[if test -n "$$1"; then

pkg_cv_[]$1="$$1"

elif test -n "$PKG_CONFIG"; then

PKG_CHECK_EXISTS([$3],

- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`

- test "x$?" != "x0" && pkg_failed=yes ],

+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],

[pkg_failed=yes])

else

pkg_failed=untried

fi[]dnl

-])dnl _PKG_CONFIG

+])# _PKG_CONFIG

-dnl _PKG_SHORT_ERRORS_SUPPORTED

-dnl ---------------------------

-dnl Internal check to see if pkg-config supports short errors.

+# _PKG_SHORT_ERRORS_SUPPORTED

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

AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],

[AC_REQUIRE([PKG_PROG_PKG_CONFIG])

if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

@@ -1270,17 +1221,19 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

else

_pkg_short_errors_supported=no

fi[]dnl

-])dnl _PKG_SHORT_ERRORS_SUPPORTED

+])# _PKG_SHORT_ERRORS_SUPPORTED

-dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],

-dnl [ACTION-IF-NOT-FOUND])

-dnl --------------------------------------------------------------

-dnl Since: 0.4.0

-dnl

-dnl Note that if there is a possibility the first call to

-dnl PKG_CHECK_MODULES might not happen, you should be sure to include an

-dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac

+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],

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

+# Note that if there is a possibility the first call to

+# PKG_CHECK_MODULES might not happen, you should be sure to include an

+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac

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

AC_DEFUN([PKG_CHECK_MODULES],

[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl

AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl

@@ -1300,9 +1253,9 @@ if test $pkg_failed = yes; then

AC_MSG_RESULT([no])

_PKG_SHORT_ERRORS_SUPPORTED

if test $_pkg_short_errors_supported = yes; then

- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`

+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`

else

- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`

+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`

# Put the nasty error message in config.log where it belongs

echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

@@ -1315,7 +1268,7 @@ $$1_PKG_ERRORS

Consider adjusting the PKG_CONFIG_PATH environment variable if you

installed software in a non-standard prefix.

-_PKG_TEXT])[]dnl

+_PKG_TEXT])

])

elif test $pkg_failed = untried; then

AC_MSG_RESULT([no])

@@ -1326,7 +1279,7 @@ path to pkg-config.

_PKG_TEXT

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])

])

else

$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

@@ -1334,107 +1287,27 @@ else

AC_MSG_RESULT([yes])

fi[]dnl

-])dnl PKG_CHECK_MODULES

-dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],

-dnl [ACTION-IF-NOT-FOUND])

-dnl ---------------------------------------------------------------------

-dnl Since: 0.29

-dnl

-dnl Checks for existence of MODULES and gathers its build flags with

-dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags

-dnl and VARIABLE-PREFIX_LIBS from --libs.

-dnl

-dnl Note that if there is a possibility the first call to

-dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to

-dnl include an explicit call to PKG_PROG_PKG_CONFIG in your

-dnl configure.ac.

-AC_DEFUN([PKG_CHECK_MODULES_STATIC],

-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl

-_save_PKG_CONFIG=$PKG_CONFIG

-PKG_CONFIG="$PKG_CONFIG --static"

-PKG_CHECK_MODULES($@)

-PKG_CONFIG=$_save_PKG_CONFIG[]dnl

-])dnl PKG_CHECK_MODULES_STATIC

-dnl PKG_INSTALLDIR([DIRECTORY])

-dnl -------------------------

-dnl Since: 0.27

-dnl

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

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

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

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

-dnl 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

-dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])

-dnl --------------------------------

-dnl Since: 0.27

-dnl

-dnl Substitutes the variable noarch_pkgconfigdir as the location where a

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

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

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

-dnl --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

-dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,

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

-dnl -------------------------------------------

-dnl Since: 0.28

-dnl

-dnl 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_CHECK_MODULES

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

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

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

-])dnl PKG_CHECK_VAR

+# Foundation, Inc.

# 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.

+# serial 1

# AM_AUTOMAKE_VERSION(VERSION)

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

# Automake X.Y traces this macro to ensure aclocal.m4 has been

# 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.11'

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.11.3], [],

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

])

@@ -1450,22 +1323,24 @@ 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.11.3])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,

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

+# serial 1

# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets

-# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to

-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.

+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to

+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.

# Of course, Automake must honor this variable whenever it calls a

# tool from the auxiliary directory. The problem is that $srcdir (and

@@ -1484,7 +1359,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

# The reason of the latter failure is that $top_srcdir and $ac_aux_dir

# are both prefixed by $srcdir. In an in-source build this is usually

-# harmless because $srcdir is '.', but things will broke when you

+# harmless because $srcdir is `.', but things will broke when you

# start a VPATH build or use an absolute $srcdir.

# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,

@@ -1502,26 +1377,30 @@ _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 -*-

+# Free Software Foundation, Inc.

# 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.

+# serial 9

# AM_CONDITIONAL(NAME, SHELL-CONDITION)

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

# Define a conditional.

AC_DEFUN([AM_CONDITIONAL],

-[AC_PREREQ([2.52])dnl

- m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],

- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl

+[AC_PREREQ(2.52)dnl

+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],

+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl

AC_SUBST([$1_TRUE])dnl

AC_SUBST([$1_FALSE])dnl

_AM_SUBST_NOTMAKE([$1_TRUE])dnl

@@ -1540,14 +1419,16 @@ AC_CONFIG_COMMANDS_PRE(

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

fi])])

+# 2010, 2011 Free Software Foundation, Inc.

# 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.

+# serial 12

-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be

+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be

# written in clear, in which case automake, when reading aclocal.m4,

# will think it sees a *use*, and therefore will trigger all it's

# C support machinery. Also note that it means that autoscan, seeing

@@ -1557,7 +1438,7 @@ fi])])

# _AM_DEPENDENCIES(NAME)

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

# See how the compiler implements dependency checking.

-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".

+# NAME is "CC", "CXX", "GCJ", or "OBJC".

# We try a few techniques and use that to set a single cache variable.

# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was

@@ -1570,13 +1451,12 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl

AC_REQUIRE([AM_MAKE_INCLUDE])dnl

AC_REQUIRE([AM_DEP_TRACK])dnl

-m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],

- [$1], [CXX], [depcc="$CXX" am_compiler_list=],

- [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],

- [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],

- [$1], [UPC], [depcc="$UPC" am_compiler_list=],

- [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],

- [depcc="$$1" am_compiler_list=])

+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],

+ [$1], CXX, [depcc="$CXX" am_compiler_list=],

+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],

+ [$1], UPC, [depcc="$UPC" am_compiler_list=],

+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],

+ [depcc="$$1" am_compiler_list=])

AC_CACHE_CHECK([dependency style of $depcc],

[am_cv_$1_dependencies_compiler_type],

@@ -1584,8 +1464,8 @@ AC_CACHE_CHECK([dependency style of $depcc],

# We make a subdir and do the tests there. Otherwise we can end up

# making bogus files that we don't know about and never remove. For

# instance it was reported that on HP-UX the gcc test will end up

- # making a dummy file named 'D' -- because '-MD' means "put the output

- # in D".

+ # making a dummy file named `D' -- because `-MD' means `put the output

+ # in D'.

rm -rf conftest.dir

mkdir conftest.dir

# Copy depcomp to subdir because otherwise we won't find it if we're

@@ -1625,16 +1505,16 @@ AC_CACHE_CHECK([dependency style of $depcc],

: > sub/conftest.c

for i in 1 2 3 4 5 6; do

echo '#include "conftst'$i'.h"' >> sub/conftest.c

- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with

- # Solaris 10 /bin/sh.

- echo '/* dummy */' > sub/conftst$i.h

+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with

+ # Solaris 8's {/usr,}/bin/sh.

+ touch sub/conftst$i.h

done

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

- # We check with '-c' and '-o' for the sake of the "dashmstdout"

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

# mode. It turns out that the SunPro C++ compiler does not properly

- # handle '-M -o', and we need to detect this. Also, some Intel

- # versions had trouble with output in subdirs.

+ # handle `-M -o', and we need to detect this. Also, some Intel

+ # versions had trouble with output in subdirs

am__obj=sub/conftest.${OBJEXT-o}

am__minus_obj="-o $am__obj"

case $depmode in

@@ -1643,8 +1523,8 @@ AC_CACHE_CHECK([dependency style of $depcc],

test "$am__universal" = false || continue

;;

nosideeffect)

- # After this tag, mechanisms are not by side-effect, so they'll

- # only be used when explicitly requested.

+ # after this tag, mechanisms are not by side-effect, so they'll

+ # only be used when explicitly requested

if test "x$enable_dependency_tracking" = xyes; then

continue

else

@@ -1652,7 +1532,7 @@ AC_CACHE_CHECK([dependency style of $depcc],

;;

msvc7 | msvc7msys | msvisualcpp | msvcmsys)

- # This compiler won't grok '-c -o', but also, the minuso test has

+ # This compiler won't grok `-c -o', but also, the minuso test has

# not run yet. These depmodes are late enough in the game, and

# so weak that their functioning should not be impacted.

am__obj=conftest.${OBJEXT-o}

@@ -1700,7 +1580,7 @@ AM_CONDITIONAL([am__fastdep$1], [

# AM_SET_DEPDIR

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

# Choose a directory name for dependency files.

-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.

+# This macro is AC_REQUIREd in _AM_DEPENDENCIES

AC_DEFUN([AM_SET_DEPDIR],

[AC_REQUIRE([AM_SET_LEADING_DOT])dnl

AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl

@@ -1710,13 +1590,9 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl

# AM_DEP_TRACK

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

AC_DEFUN([AM_DEP_TRACK],

-[AC_ARG_ENABLE([dependency-tracking], [dnl

-AS_HELP_STRING(

- [--enable-dependency-tracking],

- [do not reject slow dependency extractors])

-AS_HELP_STRING(

- [--disable-dependency-tracking],

- [speeds up one-time build])])

+[AC_ARG_ENABLE(dependency-tracking,

+[ --disable-dependency-tracking speeds up one-time build

+ --enable-dependency-tracking do not reject slow dependency extractors])

if test "x$enable_dependency_tracking" != xno; then

am_depcomp="$ac_aux_dir/depcomp"

AMDEPBACKSLASH='\'

@@ -1731,18 +1607,20 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl

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

+# Free Software Foundation, Inc.

# 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.

+#serial 5

# _AM_OUTPUT_DEPENDENCY_COMMANDS

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

AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

[{

- # Older Autoconf quotes --file arguments for eval, but not when files

+ # Autoconf 2.62 quotes --file arguments for eval, but not when files

# are listed without --file. Let's play safe and only enable the eval

# if we detect the quoting.

case $CONFIG_FILES in

@@ -1755,7 +1633,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

# Strip MF so we end up with the name of the file.

mf=`echo "$mf" | sed -e 's/:.*$//'`

# Check whether this is an Automake generated Makefile or not.

- # We used to match only the files named 'Makefile.in', but

+ # We used to match only the files named `Makefile.in', but

# some people rename them; so instead we look at the file content.

# Grep'ing the first line is not enough: some people post-process

# each Makefile.in and add a new line on top of each file to say so.

@@ -1767,19 +1645,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

continue

# Extract the definition of DEPDIR, am__include, and am__quote

- # from the Makefile without running 'make'.

+ # from the Makefile without running `make'.

DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

test -z "$DEPDIR" && continue

am__include=`sed -n 's/^am__include = //p' < "$mf"`

- test -z "$am__include" && continue

+ test -z "am__include" && continue

am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

+ # When using ansi2knr, U may be empty or an underscore; expand it

+ U=`sed -n 's/^U = //p' < "$mf"`

# Find all dependency output files, they are included files with

# $(DEPDIR) in their names. We invoke sed twice because it is the

# simplest approach to changing $(DEPDIR) to its actual value in the

# expansion.

for file in `sed -n "

s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do

+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

# Make sure the directory exists.

test -f "$dirpart/$file" && continue

fdir=`AS_DIRNAME(["$file"])`

@@ -1797,7 +1677,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

# This macro should only be invoked once -- use via AC_REQUIRE.

# This code is only required when automatic dependency tracking

-# is enabled. FIXME. This creates each '.P' file that we will

+# is enabled. FIXME. This creates each `.P' file that we will

# need in order to bootstrap the dependency handling code.

AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],

[AC_CONFIG_COMMANDS([depfiles],

@@ -1805,23 +1685,32 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],

[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])

])

+# Free Software Foundation, Inc.

+# 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.

+# serial 8

+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.

+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

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

+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.

# 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.

+# serial 16

# This macro actually does too much. Some checks are only needed if

# your package does certain things. But this isn't really a big deal.

-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.

-m4_define([AC_PROG_CC],

-m4_defn([AC_PROG_CC])

-[_AM_PROG_CC_C_O

-])

# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])

# AM_INIT_AUTOMAKE([OPTIONS])

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

@@ -1834,7 +1723,7 @@ m4_defn([AC_PROG_CC])

# arguments mandatory, and then we can depend on a new Autoconf

# release and drop the old call support.

AC_DEFUN([AM_INIT_AUTOMAKE],

-[AC_PREREQ([2.65])dnl

+[AC_PREREQ([2.62])dnl

dnl Autoconf wants to disallow AM_ names. We explicitly allow

dnl the ones we care about.

m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl

@@ -1863,42 +1752,33 @@ AC_SUBST([CYGPATH_W])

# Define the identity of the package.

dnl Distinguish between old-style and new-style calls.

m4_ifval([$2],

-[AC_DIAGNOSE([obsolete],

- [$0: two- and three-arguments forms are deprecated.])

-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl

+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl

AC_SUBST([PACKAGE], [$1])dnl

AC_SUBST([VERSION], [$2])],

[_AM_SET_OPTIONS([$1])dnl

dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.

-m4_if(

- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),

- [ok:ok],,

+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,

[m4_fatal([AC_INIT should be called with package and version arguments])])dnl

AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl

AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl

_AM_IF_OPTION([no-define],,

-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])

- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl

+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])

+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl

# Some tools Automake needs.

AC_REQUIRE([AM_SANITY_CHECK])dnl

AC_REQUIRE([AC_ARG_PROGRAM])dnl

-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])

-AM_MISSING_PROG([AUTOCONF], [autoconf])

-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])

-AM_MISSING_PROG([AUTOHEADER], [autoheader])

-AM_MISSING_PROG([MAKEINFO], [makeinfo])

+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})

+AM_MISSING_PROG(AUTOCONF, autoconf)

+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})

+AM_MISSING_PROG(AUTOHEADER, autoheader)

+AM_MISSING_PROG(MAKEINFO, makeinfo)

AC_REQUIRE([AM_PROG_INSTALL_SH])dnl

AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl

-AC_REQUIRE([AC_PROG_MKDIR_P])dnl

-# For better backward compatibility. To be removed once Automake 1.9.x

-# dies out for good. For more background, see:

-# <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.

+AC_REQUIRE([AM_PROG_MKDIR_P])dnl

+# 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

@@ -1907,82 +1787,34 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],

[_AM_PROG_TAR([v7])])])

_AM_IF_OPTION([no-dependencies],,

[AC_PROVIDE_IFELSE([AC_PROG_CC],

- [_AM_DEPENDENCIES([CC])],

- [m4_define([AC_PROG_CC],

- m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl

+ [_AM_DEPENDENCIES(CC)],

+ [define([AC_PROG_CC],

+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl

AC_PROVIDE_IFELSE([AC_PROG_CXX],

- [_AM_DEPENDENCIES([CXX])],

- [m4_define([AC_PROG_CXX],

- m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl

+ [_AM_DEPENDENCIES(CXX)],

+ [define([AC_PROG_CXX],

+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

AC_PROVIDE_IFELSE([AC_PROG_OBJC],

- [_AM_DEPENDENCIES([OBJC])],

- [m4_define([AC_PROG_OBJC],

- m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl

-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],

- [_AM_DEPENDENCIES([OBJCXX])],

- [m4_define([AC_PROG_OBJCXX],

- m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl

+ [_AM_DEPENDENCIES(OBJC)],

+ [define([AC_PROG_OBJC],

+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

])

-AC_REQUIRE([AM_SILENT_RULES])dnl

-dnl The testsuite driver may need to know about EXEEXT, so add the

-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This

-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.

+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl

+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the

+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro

+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.

AC_CONFIG_COMMANDS_PRE(dnl

[m4_provide_if([_AM_COMPILER_EXEEXT],

[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl

-# POSIX will say in a future version that running "rm -f" with no argument

-# is OK; and we want to be able to make that assumption in our Makefile

-# recipes. So use an aggressive probe to check that the usage we want is

-# actually supported "in the wild" to an acceptable degree.

-# See automake bug#10828.

-# To make any issue more visible, cause the running configure to be aborted

-# by default if the 'rm' program in use doesn't match our expectations; the

-# user can still override this though.

-if rm -f && rm -fr && rm -rf; then : OK; else

- cat >&2 <<'END'

-Oops!

-Your 'rm' program seems unable to run without file operands specified

-on the command line, even when the '-f' option is present. This is contrary

-to the behaviour of most rm programs out there, and not conforming with

-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>

-Please tell bug-automake@gnu.org about your system, including the value

-of your $PATH and any error possibly output before this message. This

-can help us improve future automake versions.

-END

- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then

- echo 'Configuration will proceed anyway, since you have set the' >&2

- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2

- echo >&2

- else

- cat >&2 <<'END'

-Aborting the configuration process, to ensure you take notice of the issue.

-You can download and install GNU coreutils to get an 'rm' implementation

-that behaves properly: <http://www.gnu.org/software/coreutils/>.

-If you want to complete the configuration process using your problematic

-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM

-to "yes", and re-run configure.

-END

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

- fi

-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.

])

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

+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

dnl mangled by Autoconf and run in a shell conditional statement.

m4_define([_AC_COMPILER_EXEEXT],

m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])

# When config.status generates a header, we must update the stamp-h file.

# This file resides in the same directory as the config header

# that is generated. The stamp files are numbered to have different names.

@@ -2004,18 +1836,21 @@ for _am_header in $config_headers :; do

done

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

+# Inc.

# 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.

+# serial 1

# AM_PROG_INSTALL_SH

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

# 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'" ;;

@@ -2023,14 +1858,16 @@ if test x"${install_sh+set}" != xset; then

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

esac

-AC_SUBST([install_sh])])

+AC_SUBST(install_sh)])

# 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.

+# serial 2

# Check whether the underlying file-system supports filenames

# with a leading dot. For instance MS-DOS doesn't.

AC_DEFUN([AM_SET_LEADING_DOT],

@@ -2046,12 +1883,14 @@ AC_SUBST([am__leading_dot])])

# 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,

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

+# serial 4

# AM_MAKE_INCLUDE()

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

# Check to see how make treats includes.

@@ -2069,7 +1908,7 @@ am__quote=

_am_result=none

# First try GNU make style include.

echo "include confinc" > confmf

-# Ignore all kinds of additional output from 'make'.

+# Ignore all kinds of additional output from `make'.

case `$am_make -s -f confmf 2> /dev/null` in #(

*the\ am__doit\ target*)

am__include=include

@@ -2096,12 +1935,15 @@ rm -f confinc confmf

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

+# Free Software Foundation, Inc.

# 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.

+# serial 6

# AM_MISSING_PROG(NAME, PROGRAM)

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

AC_DEFUN([AM_MISSING_PROG],

@@ -2109,10 +1951,11 @@ AC_DEFUN([AM_MISSING_PROG],

$1=${$1-"${am_missing_run}$2"}

AC_SUBST($1)])

# AM_MISSING_HAS_RUN

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

-# Define MISSING if not defined so far and test if it is modern enough.

-# If it is, set am_missing_run to use it, otherwise, to nothing.

+# Define MISSING if not defined so far and test if it supports --run.

+# If it does, set am_missing_run to use it, otherwise, to nothing.

AC_DEFUN([AM_MISSING_HAS_RUN],

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

AC_REQUIRE_AUX_FILE([missing])dnl

@@ -2125,51 +1968,54 @@ if test x"${MISSING+set}" != xset; then

esac

# Use eval to expand $SHELL

-if eval "$MISSING --is-lightweight"; then

- am_missing_run="$MISSING "

+if eval "$MISSING --run true"; then

+ am_missing_run="$MISSING --run "

else

am_missing_run=

- AC_MSG_WARN(['missing' script is too old or missing])

+ AC_MSG_WARN([`missing' script is too old or missing])

])

-# -*- Autoconf -*-

-# Obsolete and "removed" macros, that must however still report explicit

-# error messages when used, to smooth transition.

+# Inc.

# 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.

-AC_DEFUN([AM_CONFIG_HEADER],

-[AC_DIAGNOSE([obsolete],

-['$0': this macro is obsolete.

-You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl

-AC_CONFIG_HEADERS($@)])

-AC_DEFUN([AM_PROG_CC_STDC],

-[AC_PROG_CC

-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc

-AC_DIAGNOSE([obsolete],

-['$0': this macro is obsolete.

-You should simply use the 'AC][_PROG_CC' macro instead.

-Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',

-but upon 'ac_cv_prog_cc_stdc'.])])

-AC_DEFUN([AM_C_PROTOTYPES],

- [AC_FATAL([automatic de-ANSI-fication support has been removed])])

-AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])

+# serial 1

+# AM_PROG_MKDIR_P

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

+# Check for `mkdir -p'.

+AC_DEFUN([AM_PROG_MKDIR_P],

+[AC_PREREQ([2.60])dnl

+AC_REQUIRE([AC_PROG_MKDIR_P])dnl

+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,

+dnl while keeping a definition of mkdir_p for backward compatibility.

+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.

+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of

+dnl Makefile.ins that do not define MKDIR_P, so we do our own

+dnl adjustment using top_builddir (which is defined more often than

+dnl MKDIR_P).

+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl

+case $mkdir_p in

+ [[\\/$]]* | ?:[[\\/]]*) ;;

+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;

+esac

+])

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

+# Foundation, Inc.

# 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.

+# serial 5

# _AM_MANGLE_OPTION(NAME)

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

AC_DEFUN([_AM_MANGLE_OPTION],

@@ -2179,7 +2025,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],

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

# Set option NAME. Presently that only means defining a flag for this option.

AC_DEFUN([_AM_SET_OPTION],

-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])

+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])

# _AM_SET_OPTIONS(OPTIONS)

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

@@ -2193,82 +2039,24 @@ 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,

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

-# _AM_PROG_CC_C_O

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

-# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC

-# to automatically call this.

-AC_DEFUN([_AM_PROG_CC_C_O],

-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

-AC_REQUIRE_AUX_FILE([compile])dnl

-AC_LANG_PUSH([C])dnl

-AC_CACHE_CHECK(

- [whether $CC understands -c and -o together],

- [am_cv_prog_cc_c_o],

- [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])

- # Make sure it works both with $CC and with simple cc.

- # Following AC_PROG_CC_C_O, we do the test twice because some

- # compilers refuse to overwrite an existing .o file with -o,

- # though they will create one.

- am_cv_prog_cc_c_o=yes

- for am_i in 1 2; do

- if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \

- && test -f conftest2.$ac_objext; then

- : OK

- else

- am_cv_prog_cc_c_o=no

- break

- fi

- done

- rm -f core conftest*

- unset am_i])

-if test "$am_cv_prog_cc_c_o" != yes; then

- # Losing compiler, so override with the script.

- # FIXME: It is wrong to rewrite CC.

- # But if we don't then we get into trouble of one sort or another.

- # A longer-term fix would be to have automake use am__CC in this case,

- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"

- CC="$am_aux_dir/compile $CC"

-fi

-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,

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

-# AM_RUN_LOG(COMMAND)

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

-# Run COMMAND, save the exit status in ac_status, and log it.

-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)

-AC_DEFUN([AM_RUN_LOG],

-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD

- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD

- ac_status=$?

- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD

- (exit $ac_status); }])

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

+# Free Software Foundation, Inc.

# 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.

+# serial 5

# AM_SANITY_CHECK

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

AC_DEFUN([AM_SANITY_CHECK],

[AC_MSG_CHECKING([whether build environment is sane])

+# Just in case

+sleep 1

+echo timestamp > conftest.file

# Reject unsafe characters in $srcdir or the absolute working directory

# name. Accept space and tab only in the latter.

am_lf='

@@ -2279,40 +2067,32 @@ case `pwd` in

esac

case $srcdir in

*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)

- AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;

+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;

esac

-# Do 'set' in a subshell so we don't clobber the current shell's

+# Do `set' in a subshell so we don't clobber the current shell's

# arguments. Must try -L first in case configure is actually a

# symlink; some systems play weird games with the mod time of symlinks

# (eg FreeBSD returns the mod time of the symlink's containing

# directory).

if (

- am_has_slept=no

- for am_try in 1 2; do

- echo "timestamp, slept: $am_has_slept" > conftest.file

- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

- if test "$[*]" = "X"; then

- # -L didn't work.

- set X `ls -t "$srcdir/configure" conftest.file`

- fi

- if test "$[*]" != "X $srcdir/configure conftest.file" \

- && test "$[*]" != "X conftest.file $srcdir/configure"; then

- # If neither matched, then we have a broken ls. This can happen

- # if, for instance, CONFIG_SHELL is bash and it inherits a

- # broken ls alias from the environment. This has actually

- # happened. Such a system could not be considered "sane".

- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken

- alias in your environment])

- fi

- if test "$[2]" = conftest.file || test $am_try -eq 2; then

- break

- fi

- # Just in case.

- sleep 1

- am_has_slept=yes

- done

+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

+ if test "$[*]" = "X"; then

+ # -L didn't work.

+ set X `ls -t "$srcdir/configure" conftest.file`

+ fi

+ rm -f conftest.file

+ if test "$[*]" != "X $srcdir/configure conftest.file" \

+ && test "$[*]" != "X conftest.file $srcdir/configure"; then

+ # If neither matched, then we have a broken ls. This can happen

+ # if, for instance, CONFIG_SHELL is bash and it inherits a

+ # broken ls alias from the environment. This has actually

+ # happened. Such a system could not be considered "sane".

+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken

+alias in your environment])

+ fi

test "$[2]" = conftest.file

)

then

@@ -2322,118 +2102,46 @@ else

AC_MSG_ERROR([newly created file is older than distributed files!

Check your system clock])

-AC_MSG_RESULT([yes])

-# If we didn't sleep, we still need to ensure time stamps of config.status and

-# generated files are strictly newer.

-am_sleep_pid=

-if grep 'slept: no' conftest.file >/dev/null 2>&1; then

- ( sleep 1 ) &

- am_sleep_pid=$!

-fi

-AC_CONFIG_COMMANDS_PRE(

- [AC_MSG_CHECKING([that generated files are newer than configure])

- if test -n "$am_sleep_pid"; then

- # Hide warnings about reused PIDs.

- wait $am_sleep_pid 2>/dev/null

- fi

- AC_MSG_RESULT([done])])

-rm -f conftest.file

-])

+AC_MSG_RESULT(yes)])

# 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_SILENT_RULES([DEFAULT])

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

-# Enable less verbose build rules; with the default set to DEFAULT

-# ("yes" being less verbose, "no" or empty being verbose).

-AC_DEFUN([AM_SILENT_RULES],

-[AC_ARG_ENABLE([silent-rules], [dnl

-AS_HELP_STRING(

- [--enable-silent-rules],

- [less verbose build output (undo: "make V=1")])

-AS_HELP_STRING(

- [--disable-silent-rules],

- [verbose build output (undo: "make V=0")])dnl

-])

-case $enable_silent_rules in @%:@ (((

- yes) AM_DEFAULT_VERBOSITY=0;;

- no) AM_DEFAULT_VERBOSITY=1;;

- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;

-esac

-dnl

-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)

-dnl do not support nested variable expansions.

-dnl See automake bug#9928 and bug#10237.

-am_make=${MAKE-make}

-AC_CACHE_CHECK([whether $am_make supports nested variables],

- [am_cv_make_support_nested_variables],

- [if AS_ECHO([['TRUE=$(BAR$(V))

-BAR0=false

-BAR1=true

-V=1

-am__doit:

- @$(TRUE)

-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then

- am_cv_make_support_nested_variables=yes

-else

- am_cv_make_support_nested_variables=no

-fi])

-if test $am_cv_make_support_nested_variables = yes; then

- dnl Using '$V' instead of '$(V)' breaks IRIX make.

- AM_V='$(V)'

- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'

-else

- AM_V=$AM_DEFAULT_VERBOSITY

- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY

-fi

-AC_SUBST([AM_V])dnl

-AM_SUBST_NOTMAKE([AM_V])dnl

-AC_SUBST([AM_DEFAULT_V])dnl

-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl

-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl

-AM_BACKSLASH='\'

-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,

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

+# serial 1

# AM_PROG_INSTALL_STRIP

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

-# One issue with vendor 'install' (even GNU) is that you can't

+# One issue with vendor `install' (even GNU) is that you can't

# specify the program used to strip binaries. This is especially

# annoying in cross-compiling environments, where the build's strip

# is unlikely to handle the host's binaries.

# Fortunately install-sh will honor a STRIPPROG variable, so we

-# always use install-sh in "make install-strip", and initialize

+# always use install-sh in `make install-strip', and initialize

# STRIPPROG with the value of the STRIP variable (set by the user).

AC_DEFUN([AM_PROG_INSTALL_STRIP],

[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl

-# Installed binaries are usually stripped using 'strip' when the user

-# run "make install-strip". However 'strip' might not be the right

+# Installed binaries are usually stripped using `strip' when the user

+# run `make install-strip'. However `strip' might not be the right

# tool to use in cross-compilation environments, therefore Automake

-# will honor the 'STRIP' environment variable to overrule this program.

-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.

+# will honor the `STRIP' environment variable to overrule this program.

+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.

if test "$cross_compiling" != no; then

AC_CHECK_TOOL([STRIP], [strip], :)

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,

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

+# serial 3

# _AM_SUBST_NOTMAKE(VARIABLE)

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

# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.

@@ -2447,16 +2155,18 @@ 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,

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

+# serial 2

# _AM_PROG_TAR(FORMAT)

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

# Check how to create a tarball in format FORMAT.

-# FORMAT should be one of 'v7', 'ustar', or 'pax'.

+# FORMAT should be one of `v7', `ustar', or `pax'.

# Substitute a variable $(am__tar) that is a command

# writing to stdout a FORMAT-tarball containing the directory

@@ -2466,114 +2176,76 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

# Substitute a variable $(am__untar) that extract such

# a tarball read from stdin.

# $(am__untar) < result.tar

AC_DEFUN([_AM_PROG_TAR],

[# Always define AMTAR for backward compatibility. Yes, it's still used

# in the wild :-( We should find a proper way to deprecate it ...

AC_SUBST([AMTAR], ['$${TAR-tar}'])

-# We'll loop over all known methods to create a tar archive until one works.

-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'

m4_if([$1], [v7],

- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],

- [m4_case([$1],

- [ustar],

- [# The POSIX 1988 'ustar' format is defined with fixed-size fields.

- # There is notably a 21 bits limit for the UID and the GID. In fact,

- # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343

- # and bug#13588).

- am_max_uid=2097151 # 2^21 - 1

- am_max_gid=$am_max_uid

- # The $UID and $GID variables are not portable, so we need to resort

- # to the POSIX-mandated id(1) utility. Errors in the 'id' calls

- # below are definitely unexpected, so allow the users to see them

- # (that is, avoid stderr redirection).

- am_uid=`id -u || echo unknown`

- am_gid=`id -g || echo unknown`

- AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])

- if test $am_uid -le $am_max_uid; then

- AC_MSG_RESULT([yes])

- else

- AC_MSG_RESULT([no])

- _am_tools=none

- fi

- AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])

- if test $am_gid -le $am_max_gid; then

- AC_MSG_RESULT([yes])

- else

- AC_MSG_RESULT([no])

- _am_tools=none

- fi],

- [pax],

- [],

- [m4_fatal([Unknown tar format])])

- AC_MSG_CHECKING([how to create a $1 tar archive])

- # Go ahead even if we have the value already cached. We do so because we

- # need to set the values for the 'am__tar' and 'am__untar' variables.

- _am_tools=${am_cv_prog_tar_$1-$_am_tools}

+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],

+ [m4_case([$1], [ustar],, [pax],,

+ [m4_fatal([Unknown tar format])])

+AC_MSG_CHECKING([how to create a $1 tar archive])

+# Loop over all known methods to create a tar archive until one works.

+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'

+_am_tools=${am_cv_prog_tar_$1-$_am_tools}

+# Do not fold the above two line into one, because Tru64 sh and

+# Solaris sh will not grok spaces in the rhs of `-'.

+for _am_tool in $_am_tools

+do

+ case $_am_tool in

+ gnutar)

+ for _am_tar in tar gnutar gtar;

+ do

+ AM_RUN_LOG([$_am_tar --version]) && break

+ done

+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'

+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'

+ am__untar="$_am_tar -xf -"

+ ;;

+ plaintar)

+ # Must skip GNU tar: if it does not support --format= it doesn't create

+ # ustar tarball either.

+ (tar --version) >/dev/null 2>&1 && continue

+ am__tar='tar chf - "$$tardir"'

+ am__tar_='tar chf - "$tardir"'

+ am__untar='tar xf -'

+ ;;

+ pax)

+ am__tar='pax -L -x $1 -w "$$tardir"'

+ am__tar_='pax -L -x $1 -w "$tardir"'

+ am__untar='pax -r'

+ ;;

+ cpio)

+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'

+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'

+ am__untar='cpio -i -H $1 -d'

+ ;;

+ none)

+ am__tar=false

+ am__tar_=false

+ am__untar=false

+ ;;

+ esac

- for _am_tool in $_am_tools; do

- case $_am_tool in

- gnutar)

- for _am_tar in tar gnutar gtar; do

- AM_RUN_LOG([$_am_tar --version]) && break

- done

- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'

- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'

- am__untar="$_am_tar -xf -"

- ;;

- plaintar)

- # Must skip GNU tar: if it does not support --format= it doesn't create

- # ustar tarball either.

- (tar --version) >/dev/null 2>&1 && continue

- am__tar='tar chf - "$$tardir"'

- am__tar_='tar chf - "$tardir"'

- am__untar='tar xf -'

- ;;

- pax)

- am__tar='pax -L -x $1 -w "$$tardir"'

- am__tar_='pax -L -x $1 -w "$tardir"'

- am__untar='pax -r'

- ;;

- cpio)

- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'

- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'

- am__untar='cpio -i -H $1 -d'

- ;;

- none)

- am__tar=false

- am__tar_=false

- am__untar=false

- ;;

- esac

+ # If the value was cached, stop now. We just wanted to have am__tar

+ # and am__untar set.

+ test -n "${am_cv_prog_tar_$1}" && break

- # If the value was cached, stop now. We just wanted to have am__tar

- # and am__untar set.

- test -n "${am_cv_prog_tar_$1}" && break

- # tar/untar a dummy directory, and stop if the command works.

- rm -rf conftest.dir

- mkdir conftest.dir

- echo GrepMe > conftest.dir/file

- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])

- rm -rf conftest.dir

- if test -s conftest.tar; then

- AM_RUN_LOG([$am__untar <conftest.tar])

- AM_RUN_LOG([cat conftest.dir/file])

- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break

- fi

- done

+ # tar/untar a dummy directory, and stop if the command works

rm -rf conftest.dir

+ mkdir conftest.dir

+ echo GrepMe > conftest.dir/file

+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])

+ rm -rf conftest.dir

+ if test -s conftest.tar; then

+ AM_RUN_LOG([$am__untar <conftest.tar])

+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break

+ fi

+done

+rm -rf conftest.dir

- AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])

- AC_MSG_RESULT([$am_cv_prog_tar_$1])])

+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])

+AC_MSG_RESULT([$am_cv_prog_tar_$1])])

AC_SUBST([am__tar])

AC_SUBST([am__untar])

]) # _AM_PROG_TAR

« no previous file with comments | « TODO ('k') | compile » ('j') | no next file with comments »