Diff for /embedaddon/mtr/aclocal.m4 between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2016/11/01 09:33:48 version 1.1.1.3, 2016/11/01 09:44:48
Line 1 Line 1
# generated automatically by aclocal 1.14.1 -*- Autoconf -*-# generated automatically by aclocal 1.15 -*- Autoconf -*-
   
# Copyright (C) 1996-2013 Free Software Foundation, Inc.# Copyright (C) 1996-2014 Free Software Foundation, Inc.
   
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 46  AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do n Line 46  AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do n
   
   no_gtk=""    no_gtk=""
   
  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
   PKG_PROG_PKG_CONFIG([0.7])
   
   if test x$PKG_CONFIG != xno ; then  
     if pkg-config --atleast-pkgconfig-version 0.7 ; then  
       :  
     else  
       echo "*** pkg-config too old; version 0.7 or better required."  
       no_gtk=yes  
       PKG_CONFIG=no  
     fi  
   else  
     no_gtk=yes  
   fi  
   
   min_gtk_version=ifelse([$1], ,2.0.0,$1)    min_gtk_version=ifelse([$1], ,2.0.0,$1)
   AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)    AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
   
Line 217  main () Line 206  main ()
   rm -f conf.gtktest    rm -f conf.gtktest
 ])  ])
   
# Copyright (C) 2002-2013 Free Software Foundation, Inc.# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #  #
   # 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)$])
   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])
   
   if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
           AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
   fi
   if test -n "$PKG_CONFIG"; then
           _pkg_min_version=m4_default([$1], [0.9.0])
           AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
           if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
                   AC_MSG_RESULT([yes])
           else
                   AC_MSG_RESULT([no])
                   PKG_CONFIG=""
           fi
   fi[]dnl
   ])# 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" && \
       AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
     m4_default([$2], [:])
   m4_ifvaln([$3], [else
     $3])dnl
   fi])
   
   # _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_failed=yes])
    else
       pkg_failed=untried
   fi[]dnl
   ])# _PKG_CONFIG
   
   # _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
           _pkg_short_errors_supported=yes
   else
           _pkg_short_errors_supported=no
   fi[]dnl
   ])# _PKG_SHORT_ERRORS_SUPPORTED
   
   
   # 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
   AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
   
   pkg_failed=no
   AC_MSG_CHECKING([for $1])
   
   _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
   _PKG_CONFIG([$1][_LIBS], [libs], [$2])
   
   m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
   and $1[]_LIBS to avoid the need to call pkg-config.
   See the pkg-config man page for more details.])
   
   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`
           else 
                   $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
           fi
           # Put the nasty error message in config.log where it belongs
           echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
   
           m4_default([$4], [AC_MSG_ERROR(
   [Package requirements ($2) were not met:
   
   $$1_PKG_ERRORS
   
   Consider adjusting the PKG_CONFIG_PATH environment variable if you
   installed software in a non-standard prefix.
   
   _PKG_TEXT])[]dnl
           ])
   elif test $pkg_failed = untried; then
           AC_MSG_RESULT([no])
           m4_default([$4], [AC_MSG_FAILURE(
   [The pkg-config script could not be found or is too old.  Make sure it
   is in your PATH or set the PKG_CONFIG environment variable to the full
   path to pkg-config.
   
   _PKG_TEXT
   
   To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
           ])
   else
           $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
           $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
           AC_MSG_RESULT([yes])
           $3
   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
   
   # PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
   #                  [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
   #                  [DESCRIPTION], [DEFAULT])
   #
   # Prepare a "--with-" configure option using the lowercase [VARIABLE-PREFIX]
   # name, merging the behaviour of AC_ARG_WITH and PKG_CHECK_MODULES in a single
   # macro
   #
   # --------------------------------------------------------------
   AC_DEFUN([PKG_WITH_MODULES],
   [
   m4_pushdef([with_arg], m4_tolower([$1]))
   
   m4_pushdef([description],
              [m4_default([$5], [build with ]with_arg[ support])])
   
   m4_pushdef([def_arg], [m4_default([$6], [auto])])
   m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
   m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
   
   m4_case(def_arg,
               [yes],[m4_pushdef([with_without], [--without-]with_arg)],
               [m4_pushdef([with_without],[--with-]with_arg)])
   
   AC_ARG_WITH(with_arg,
        AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
       [AS_TR_SH([with_]with_arg)=def_arg])
   
   AS_CASE([$AS_TR_SH([with_]with_arg)],
               [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
               [auto],[PKG_CHECK_MODULES([$1],[$2],
                                           [m4_n([def_action_if_found]) $3],
                                           [m4_n([def_action_if_not_found]) $4])])
   
   m4_popdef([with_arg])
   m4_popdef([description])
   m4_popdef([def_arg])
   
   ]) dnl PKG_WITH_MODULES
   
   # PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
   #                       [DESCRIPTION], [DEFAULT])
   #
   # Convenience macro to trigger AM_CONDITIONAL after
   # PKG_WITH_MODULES check.
   #
   # HAVE_[VARIABLE-PREFIX] is exported as make variable.
   #
   # --------------------------------------------------------------
   AC_DEFUN([PKG_HAVE_WITH_MODULES],
   [
   PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
   
   AM_CONDITIONAL([HAVE_][$1],
                  [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
   ])
   
   # PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
   #                              [DESCRIPTION], [DEFAULT])
   #
   # Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
   # PKG_WITH_MODULES check.
   #
   # HAVE_[VARIABLE-PREFIX] is exported as make and preprocessor variable.
   #
   # --------------------------------------------------------------
   AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
   [
   PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
   
   AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
           [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
   ])
   
   # Copyright (C) 2002-2014 Free Software Foundation, Inc.
   #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.  # with or without modifications, as long as this notice is preserved.
Line 229  main () Line 506  main ()
 # generated from the m4 files accompanying Automake X.Y.  # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)  # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],  AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.14'[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to  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.  dnl require some minimum version.  Point them to the right macro.
m4_if([$1], [1.14.1], [],m4_if([$1], [1.15], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])  ])
   
Line 248  m4_define([_AM_AUTOCONF_VERSION], []) Line 525  m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.  # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.14.1])dnl[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],  m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
   
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
   
# Copyright (C) 2001-2013 Free Software Foundation, Inc.# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 300  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) Line 577  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # configured tree to be moved without reconfiguration.  # configured tree to be moved without reconfiguration.
   
 AC_DEFUN([AM_AUX_DIR_EXPAND],  AC_DEFUN([AM_AUX_DIR_EXPAND],
[dnl Rely on autoconf to set up CDPATH properly.[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_PREREQ([2.50])dnlExpand $ac_aux_dir to an absolute path.
expand $ac_aux_dir to an absolute patham_aux_dir=`cd "$ac_aux_dir" && pwd`
am_aux_dir=`cd $ac_aux_dir && pwd` 
 ])  ])
   
 # AM_CONDITIONAL                                            -*- Autoconf -*-  # AM_CONDITIONAL                                            -*- Autoconf -*-
   
# Copyright (C) 1997-2013 Free Software Foundation, Inc.# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 339  AC_CONFIG_COMMANDS_PRE( Line 615  AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])  Usually this means the macro was only invoked conditionally.]])
 fi])])  fi])])
   
# Copyright (C) 1999-2013 Free Software Foundation, Inc.# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 530  _AM_SUBST_NOTMAKE([am__nodep])dnl Line 806  _AM_SUBST_NOTMAKE([am__nodep])dnl
   
 # Generate code to set up dependency tracking.              -*- Autoconf -*-  # Generate code to set up dependency tracking.              -*- Autoconf -*-
   
# Copyright (C) 1999-2013 Free Software Foundation, Inc.# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 606  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], Line 882  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
   
 # Do all the work for Automake.                             -*- Autoconf -*-  # Do all the work for Automake.                             -*- Autoconf -*-
   
# Copyright (C) 1996-2013 Free Software Foundation, Inc.# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 696  AC_REQUIRE([AC_PROG_MKDIR_P])dnl Line 972  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/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>  # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])  AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target.  The system "awk" is bad on# We need awk for the "check" target (and possibly the TAP driver).  The
# some platforms.# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl  AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl  AC_REQUIRE([AM_SET_LEADING_DOT])dnl
Line 770  to "yes", and re-run configure. Line 1046  to "yes", and re-run configure.
 END  END
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])      AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi    fi
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 add the conditional right here, as _AC_COMPILER_EXEEXT may be further
Line 799  for _am_header in $config_headers :; do Line 1079  for _am_header in $config_headers :; do
 done  done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])  echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
   
# Copyright (C) 2001-2013 Free Software Foundation, Inc.# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 810  echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg" Line 1090  echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"
 # Define $install_sh.  # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],  AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
if test x"${install_sh}" != xset; thenif test x"${install_sh+set}" != xset; then
   case $am_aux_dir in    case $am_aux_dir in
   *\ * | *\     *)    *\ * | *\     *)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;      install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
Line 820  if test x"${install_sh}" != xset; then Line 1100  if test x"${install_sh}" != xset; then
 fi  fi
 AC_SUBST([install_sh])])  AC_SUBST([install_sh])])
   
# Copyright (C) 2003-2013 Free Software Foundation, Inc.# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 841  AC_SUBST([am__leading_dot])]) Line 1121  AC_SUBST([am__leading_dot])])
   
 # Check to see how 'make' treats includes.                  -*- Autoconf -*-  # Check to see how 'make' treats includes.                  -*- Autoconf -*-
   
# Copyright (C) 2001-2013 Free Software Foundation, Inc.# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 891  rm -f confinc confmf Line 1171  rm -f confinc confmf
   
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-  # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
   
# Copyright (C) 1997-2013 Free Software Foundation, Inc.# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 930  fi Line 1210  fi
   
 # Helper functions for option handling.                     -*- Autoconf -*-  # Helper functions for option handling.                     -*- Autoconf -*-
   
# Copyright (C) 2001-2013 Free Software Foundation, Inc.# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 959  AC_DEFUN([_AM_SET_OPTIONS], Line 1239  AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],  AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])  [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
   
# Copyright (C) 1999-2013 Free Software Foundation, Inc.# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 1006  AC_LANG_POP([C])]) Line 1286  AC_LANG_POP([C])])
 # For backward compatibility.  # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])  AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
   
# Copyright (C) 2001-2013 Free Software Foundation, Inc.# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 1025  AC_DEFUN([AM_RUN_LOG], Line 1305  AC_DEFUN([AM_RUN_LOG],
   
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-  # Check to make sure that the build environment is sane.    -*- Autoconf -*-
   
# Copyright (C) 1996-2013 Free Software Foundation, Inc.# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 1106  AC_CONFIG_COMMANDS_PRE( Line 1386  AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file  rm -f conftest.file
 ])  ])
   
# Copyright (C) 2009-2013 Free Software Foundation, Inc.# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 1166  AC_SUBST([AM_BACKSLASH])dnl Line 1446  AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl  _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])  ])
   
# Copyright (C) 2001-2013 Free Software Foundation, Inc.# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 1194  fi Line 1474  fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])  AC_SUBST([INSTALL_STRIP_PROGRAM])])
   
# Copyright (C) 2006-2013 Free Software Foundation, Inc.# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 1213  AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) Line 1493  AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
   
 # Check how to create a tarball.                            -*- Autoconf -*-  # Check how to create a tarball.                            -*- Autoconf -*-
   
# Copyright (C) 2004-2013 Free Software Foundation, Inc.# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>