ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/aclocal.m4
(Generate patch)

Comparing:
ircd-hybrid-8/aclocal.m4 (file contents), Revision 1291 by michael, Sun Feb 12 20:24:41 2012 UTC vs.
ircd-hybrid/trunk/aclocal.m4 (file contents), Revision 2178 by michael, Mon Jun 3 23:56:42 2013 UTC

# Line 1 | Line 1
1 < # generated automatically by aclocal 1.11.3 -*- Autoconf -*-
1 > # generated automatically by aclocal 1.13.3 -*- Autoconf -*-
2 >
3 > # Copyright (C) 1996-2013 Free Software Foundation, Inc.
4  
3 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
5 # Inc.
5   # This file is free software; the Free Software Foundation
6   # gives unlimited permission to copy and/or distribute it,
7   # with or without modifications, as long as this notice is preserved.
# Line 12 | Line 11
11   # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12   # PARTICULAR PURPOSE.
13  
14 + m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15   m4_ifndef([AC_AUTOCONF_VERSION],
16    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17 < m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
18 < [m4_warning([this file was generated for autoconf 2.68.
17 > m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18 > [m4_warning([this file was generated for autoconf 2.69.
19   You have another version of autoconf.  It may work, but is not guaranteed to.
20   If you have problems, you may need to regenerate the build system entirely.
21 < To do so, use the procedure documented by the package, typically `autoreconf'.])])
21 > To do so, use the procedure documented by the package, typically 'autoreconf'.])])
22  
23   # Portability macros for glibc argz.                    -*- Autoconf -*-
24   #
# Line 9505 | Line 9505 | m4_ifndef([_LT_PROG_F77],              [AC_DEFUN([_L
9505   m4_ifndef([_LT_PROG_FC],                [AC_DEFUN([_LT_PROG_FC])])
9506   m4_ifndef([_LT_PROG_CXX],               [AC_DEFUN([_LT_PROG_CXX])])
9507  
9508 < # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
9509 < # Foundation, Inc.
9508 > # Copyright (C) 2002-2013 Free Software Foundation, Inc.
9509   #
9510   # This file is free software; the Free Software Foundation
9511   # gives unlimited permission to copy and/or distribute it,
9512   # with or without modifications, as long as this notice is preserved.
9513  
9515 # serial 1
9516
9514   # AM_AUTOMAKE_VERSION(VERSION)
9515   # ----------------------------
9516   # Automake X.Y traces this macro to ensure aclocal.m4 has been
9517   # generated from the m4 files accompanying Automake X.Y.
9518   # (This private macro should not be called outside this file.)
9519   AC_DEFUN([AM_AUTOMAKE_VERSION],
9520 < [am__api_version='1.11'
9520 > [am__api_version='1.13'
9521   dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
9522   dnl require some minimum version.  Point them to the right macro.
9523 < m4_if([$1], [1.11.3], [],
9523 > m4_if([$1], [1.13.3], [],
9524        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
9525   ])
9526  
# Line 9539 | Line 9536 | m4_define([_AM_AUTOCONF_VERSION], [])
9536   # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
9537   # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
9538   AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
9539 < [AM_AUTOMAKE_VERSION([1.11.3])dnl
9539 > [AM_AUTOMAKE_VERSION([1.13.3])dnl
9540   m4_ifndef([AC_AUTOCONF_VERSION],
9541    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
9542   _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
9543  
9544   # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
9545  
9546 < # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
9546 > # Copyright (C) 2001-2013 Free Software Foundation, Inc.
9547   #
9548   # This file is free software; the Free Software Foundation
9549   # gives unlimited permission to copy and/or distribute it,
9550   # with or without modifications, as long as this notice is preserved.
9551  
9555 # serial 1
9556
9552   # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
9553 < # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
9554 < # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
9553 > # $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
9554 > # '$srcdir', '$srcdir/..', or '$srcdir/../..'.
9555   #
9556   # Of course, Automake must honor this variable whenever it calls a
9557   # tool from the auxiliary directory.  The problem is that $srcdir (and
# Line 9575 | Line 9570 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCON
9570   #
9571   # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
9572   # are both prefixed by $srcdir.  In an in-source build this is usually
9573 < # harmless because $srcdir is `.', but things will broke when you
9573 > # harmless because $srcdir is '.', but things will broke when you
9574   # start a VPATH build or use an absolute $srcdir.
9575   #
9576   # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
# Line 9601 | Line 9596 | am_aux_dir=`cd $ac_aux_dir && pwd`
9596  
9597   # AM_CONDITIONAL                                            -*- Autoconf -*-
9598  
9599 < # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
9605 < # Free Software Foundation, Inc.
9599 > # Copyright (C) 1997-2013 Free Software Foundation, Inc.
9600   #
9601   # This file is free software; the Free Software Foundation
9602   # gives unlimited permission to copy and/or distribute it,
9603   # with or without modifications, as long as this notice is preserved.
9604  
9611 # serial 9
9612
9605   # AM_CONDITIONAL(NAME, SHELL-CONDITION)
9606   # -------------------------------------
9607   # Define a conditional.
9608   AC_DEFUN([AM_CONDITIONAL],
9609 < [AC_PREREQ(2.52)dnl
9610 < ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
9611 <        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
9609 > [AC_PREREQ([2.52])dnl
9610 > m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
9611 >       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
9612   AC_SUBST([$1_TRUE])dnl
9613   AC_SUBST([$1_FALSE])dnl
9614   _AM_SUBST_NOTMAKE([$1_TRUE])dnl
# Line 9635 | Line 9627 | AC_CONFIG_COMMANDS_PRE(
9627   Usually this means the macro was only invoked conditionally.]])
9628   fi])])
9629  
9630 < # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
9639 < # 2010, 2011 Free Software Foundation, Inc.
9630 > # Copyright (C) 1999-2013 Free Software Foundation, Inc.
9631   #
9632   # This file is free software; the Free Software Foundation
9633   # gives unlimited permission to copy and/or distribute it,
9634   # with or without modifications, as long as this notice is preserved.
9635  
9645 # serial 12
9636  
9637 < # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
9637 > # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
9638   # written in clear, in which case automake, when reading aclocal.m4,
9639   # will think it sees a *use*, and therefore will trigger all it's
9640   # C support machinery.  Also note that it means that autoscan, seeing
# Line 9654 | Line 9644 | fi])])
9644   # _AM_DEPENDENCIES(NAME)
9645   # ----------------------
9646   # See how the compiler implements dependency checking.
9647 < # NAME is "CC", "CXX", "GCJ", or "OBJC".
9647 > # NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
9648   # We try a few techniques and use that to set a single cache variable.
9649   #
9650   # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
# Line 9667 | Line 9657 | AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMAND
9657   AC_REQUIRE([AM_MAKE_INCLUDE])dnl
9658   AC_REQUIRE([AM_DEP_TRACK])dnl
9659  
9660 < ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
9661 <       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
9662 <       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
9663 <       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
9664 <       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
9665 <                   [depcc="$$1"   am_compiler_list=])
9660 > m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
9661 >      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
9662 >      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
9663 >      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
9664 >      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
9665 >      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
9666 >                    [depcc="$$1"   am_compiler_list=])
9667  
9668   AC_CACHE_CHECK([dependency style of $depcc],
9669                 [am_cv_$1_dependencies_compiler_type],
# Line 9680 | Line 9671 | AC_CACHE_CHECK([dependency style of $dep
9671    # We make a subdir and do the tests there.  Otherwise we can end up
9672    # making bogus files that we don't know about and never remove.  For
9673    # instance it was reported that on HP-UX the gcc test will end up
9674 <  # making a dummy file named `D' -- because `-MD' means `put the output
9675 <  # in D'.
9674 >  # making a dummy file named 'D' -- because '-MD' means "put the output
9675 >  # in D".
9676    rm -rf conftest.dir
9677    mkdir conftest.dir
9678    # Copy depcomp to subdir because otherwise we won't find it if we're
# Line 9721 | Line 9712 | AC_CACHE_CHECK([dependency style of $dep
9712      : > sub/conftest.c
9713      for i in 1 2 3 4 5 6; do
9714        echo '#include "conftst'$i'.h"' >> sub/conftest.c
9715 <      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
9716 <      # Solaris 8's {/usr,}/bin/sh.
9717 <      touch sub/conftst$i.h
9715 >      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
9716 >      # Solaris 10 /bin/sh.
9717 >      echo '/* dummy */' > sub/conftst$i.h
9718      done
9719      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
9720  
9721 <    # We check with `-c' and `-o' for the sake of the "dashmstdout"
9721 >    # We check with '-c' and '-o' for the sake of the "dashmstdout"
9722      # mode.  It turns out that the SunPro C++ compiler does not properly
9723 <    # handle `-M -o', and we need to detect this.  Also, some Intel
9724 <    # versions had trouble with output in subdirs
9723 >    # handle '-M -o', and we need to detect this.  Also, some Intel
9724 >    # versions had trouble with output in subdirs.
9725      am__obj=sub/conftest.${OBJEXT-o}
9726      am__minus_obj="-o $am__obj"
9727      case $depmode in
# Line 9739 | Line 9730 | AC_CACHE_CHECK([dependency style of $dep
9730        test "$am__universal" = false || continue
9731        ;;
9732      nosideeffect)
9733 <      # after this tag, mechanisms are not by side-effect, so they'll
9734 <      # only be used when explicitly requested
9733 >      # After this tag, mechanisms are not by side-effect, so they'll
9734 >      # only be used when explicitly requested.
9735        if test "x$enable_dependency_tracking" = xyes; then
9736          continue
9737        else
# Line 9748 | Line 9739 | AC_CACHE_CHECK([dependency style of $dep
9739        fi
9740        ;;
9741      msvc7 | msvc7msys | msvisualcpp | msvcmsys)
9742 <      # This compiler won't grok `-c -o', but also, the minuso test has
9742 >      # This compiler won't grok '-c -o', but also, the minuso test has
9743        # not run yet.  These depmodes are late enough in the game, and
9744        # so weak that their functioning should not be impacted.
9745        am__obj=conftest.${OBJEXT-o}
# Line 9796 | Line 9787 | AM_CONDITIONAL([am__fastdep$1], [
9787   # AM_SET_DEPDIR
9788   # -------------
9789   # Choose a directory name for dependency files.
9790 < # This macro is AC_REQUIREd in _AM_DEPENDENCIES
9790 > # This macro is AC_REQUIREd in _AM_DEPENDENCIES.
9791   AC_DEFUN([AM_SET_DEPDIR],
9792   [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
9793   AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
# Line 9806 | Line 9797 | AC_SUBST([DEPDIR], ["${am__leading_dot}d
9797   # AM_DEP_TRACK
9798   # ------------
9799   AC_DEFUN([AM_DEP_TRACK],
9800 < [AC_ARG_ENABLE(dependency-tracking,
9801 < [  --disable-dependency-tracking  speeds up one-time build
9802 <  --enable-dependency-tracking   do not reject slow dependency extractors])
9800 > [AC_ARG_ENABLE([dependency-tracking], [dnl
9801 > AS_HELP_STRING(
9802 >  [--enable-dependency-tracking],
9803 >  [do not reject slow dependency extractors])
9804 > AS_HELP_STRING(
9805 >  [--disable-dependency-tracking],
9806 >  [speeds up one-time build])])
9807   if test "x$enable_dependency_tracking" != xno; then
9808    am_depcomp="$ac_aux_dir/depcomp"
9809    AMDEPBACKSLASH='\'
# Line 9823 | Line 9818 | _AM_SUBST_NOTMAKE([am__nodep])dnl
9818  
9819   # Generate code to set up dependency tracking.              -*- Autoconf -*-
9820  
9821 < # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
9827 < # Free Software Foundation, Inc.
9821 > # Copyright (C) 1999-2013 Free Software Foundation, Inc.
9822   #
9823   # This file is free software; the Free Software Foundation
9824   # gives unlimited permission to copy and/or distribute it,
9825   # with or without modifications, as long as this notice is preserved.
9826  
9833 #serial 5
9827  
9828   # _AM_OUTPUT_DEPENDENCY_COMMANDS
9829   # ------------------------------
9830   AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
9831   [{
9832 <  # Autoconf 2.62 quotes --file arguments for eval, but not when files
9832 >  # Older Autoconf quotes --file arguments for eval, but not when files
9833    # are listed without --file.  Let's play safe and only enable the eval
9834    # if we detect the quoting.
9835    case $CONFIG_FILES in
# Line 9849 | Line 9842 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
9842      # Strip MF so we end up with the name of the file.
9843      mf=`echo "$mf" | sed -e 's/:.*$//'`
9844      # Check whether this is an Automake generated Makefile or not.
9845 <    # We used to match only the files named `Makefile.in', but
9845 >    # We used to match only the files named 'Makefile.in', but
9846      # some people rename them; so instead we look at the file content.
9847      # Grep'ing the first line is not enough: some people post-process
9848      # each Makefile.in and add a new line on top of each file to say so.
# Line 9861 | Line 9854 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
9854        continue
9855      fi
9856      # Extract the definition of DEPDIR, am__include, and am__quote
9857 <    # from the Makefile without running `make'.
9857 >    # from the Makefile without running 'make'.
9858      DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
9859      test -z "$DEPDIR" && continue
9860      am__include=`sed -n 's/^am__include = //p' < "$mf"`
9861 <    test -z "am__include" && continue
9861 >    test -z "$am__include" && continue
9862      am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
9870    # When using ansi2knr, U may be empty or an underscore; expand it
9871    U=`sed -n 's/^U = //p' < "$mf"`
9863      # Find all dependency output files, they are included files with
9864      # $(DEPDIR) in their names.  We invoke sed twice because it is the
9865      # simplest approach to changing $(DEPDIR) to its actual value in the
9866      # expansion.
9867      for file in `sed -n "
9868        s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
9869 <         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
9869 >         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
9870        # Make sure the directory exists.
9871        test -f "$dirpart/$file" && continue
9872        fdir=`AS_DIRNAME(["$file"])`
# Line 9893 | Line 9884 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
9884   # This macro should only be invoked once -- use via AC_REQUIRE.
9885   #
9886   # This code is only required when automatic dependency tracking
9887 < # is enabled.  FIXME.  This creates each `.P' file that we will
9887 > # is enabled.  FIXME.  This creates each '.P' file that we will
9888   # need in order to bootstrap the dependency handling code.
9889   AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
9890   [AC_CONFIG_COMMANDS([depfiles],
# Line 9903 | Line 9894 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
9894  
9895   # Do all the work for Automake.                             -*- Autoconf -*-
9896  
9897 < # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
9907 < # 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
9897 > # Copyright (C) 1996-2013 Free Software Foundation, Inc.
9898   #
9899   # This file is free software; the Free Software Foundation
9900   # gives unlimited permission to copy and/or distribute it,
9901   # with or without modifications, as long as this notice is preserved.
9902  
9913 # serial 16
9914
9903   # This macro actually does too much.  Some checks are only needed if
9904   # your package does certain things.  But this isn't really a big deal.
9905  
# Line 9927 | Line 9915 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
9915   # arguments mandatory, and then we can depend on a new Autoconf
9916   # release and drop the old call support.
9917   AC_DEFUN([AM_INIT_AUTOMAKE],
9918 < [AC_PREREQ([2.62])dnl
9918 > [AC_PREREQ([2.65])dnl
9919   dnl Autoconf wants to disallow AM_ names.  We explicitly allow
9920   dnl the ones we care about.
9921   m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
# Line 9956 | Line 9944 | AC_SUBST([CYGPATH_W])
9944   # Define the identity of the package.
9945   dnl Distinguish between old-style and new-style calls.
9946   m4_ifval([$2],
9947 < [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
9947 > [AC_DIAGNOSE([obsolete],
9948 >             [$0: two- and three-arguments forms are deprecated.])
9949 > m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
9950   AC_SUBST([PACKAGE], [$1])dnl
9951   AC_SUBST([VERSION], [$2])],
9952   [_AM_SET_OPTIONS([$1])dnl
9953   dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
9954 < m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
9954 > m4_if(
9955 >  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
9956 >  [ok:ok],,
9957    [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
9958   AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
9959   AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
9960  
9961   _AM_IF_OPTION([no-define],,
9962 < [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
9963 < AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
9962 > [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
9963 > AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
9964  
9965   # Some tools Automake needs.
9966   AC_REQUIRE([AM_SANITY_CHECK])dnl
9967   AC_REQUIRE([AC_ARG_PROGRAM])dnl
9968 < AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
9969 < AM_MISSING_PROG(AUTOCONF, autoconf)
9970 < AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
9971 < AM_MISSING_PROG(AUTOHEADER, autoheader)
9972 < AM_MISSING_PROG(MAKEINFO, makeinfo)
9968 > AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
9969 > AM_MISSING_PROG([AUTOCONF], [autoconf])
9970 > AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
9971 > AM_MISSING_PROG([AUTOHEADER], [autoheader])
9972 > AM_MISSING_PROG([MAKEINFO], [makeinfo])
9973   AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
9974   AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
9975 < AC_REQUIRE([AM_PROG_MKDIR_P])dnl
9975 > AC_REQUIRE([AC_PROG_MKDIR_P])dnl
9976 > # For better backward compatibility.  To be removed once Automake 1.9.x
9977 > # dies out for good.  For more background, see:
9978 > # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
9979 > # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
9980 > AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
9981   # We need awk for the "check" target.  The system "awk" is bad on
9982   # some platforms.
9983   AC_REQUIRE([AC_PROG_AWK])dnl
# Line 9991 | Line 9988 | _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR
9988                               [_AM_PROG_TAR([v7])])])
9989   _AM_IF_OPTION([no-dependencies],,
9990   [AC_PROVIDE_IFELSE([AC_PROG_CC],
9991 <                  [_AM_DEPENDENCIES(CC)],
9992 <                  [define([AC_PROG_CC],
9993 <                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
9991 >                  [_AM_DEPENDENCIES([CC])],
9992 >                  [m4_define([AC_PROG_CC],
9993 >                             m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
9994   AC_PROVIDE_IFELSE([AC_PROG_CXX],
9995 <                  [_AM_DEPENDENCIES(CXX)],
9996 <                  [define([AC_PROG_CXX],
9997 <                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
9995 >                  [_AM_DEPENDENCIES([CXX])],
9996 >                  [m4_define([AC_PROG_CXX],
9997 >                             m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
9998   AC_PROVIDE_IFELSE([AC_PROG_OBJC],
9999 <                  [_AM_DEPENDENCIES(OBJC)],
10000 <                  [define([AC_PROG_OBJC],
10001 <                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
10002 < ])
10003 < _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
10004 < dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
10005 < dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
10006 < dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
9999 >                  [_AM_DEPENDENCIES([OBJC])],
10000 >                  [m4_define([AC_PROG_OBJC],
10001 >                             m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
10002 > AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
10003 >                  [_AM_DEPENDENCIES([OBJCXX])],
10004 >                  [m4_define([AC_PROG_OBJCXX],
10005 >                             m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
10006 > ])
10007 > AC_REQUIRE([AM_SILENT_RULES])dnl
10008 > dnl The testsuite driver may need to know about EXEEXT, so add the
10009 > dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
10010 > dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
10011   AC_CONFIG_COMMANDS_PRE(dnl
10012   [m4_provide_if([_AM_COMPILER_EXEEXT],
10013    [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
10014   ])
10015  
10016 < dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
10016 > dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
10017   dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
10018   dnl mangled by Autoconf and run in a shell conditional statement.
10019   m4_define([_AC_COMPILER_EXEEXT],
# Line 10040 | Line 10041 | for _am_header in $config_headers :; do
10041   done
10042   echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
10043  
10044 < # Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
10044 < # Inc.
10044 > # Copyright (C) 2001-2013 Free Software Foundation, Inc.
10045   #
10046   # This file is free software; the Free Software Foundation
10047   # gives unlimited permission to copy and/or distribute it,
10048   # with or without modifications, as long as this notice is preserved.
10049  
10050 # serial 1
10051
10050   # AM_PROG_INSTALL_SH
10051   # ------------------
10052   # Define $install_sh.
# Line 10062 | Line 10060 | if test x"${install_sh}" != xset; then
10060      install_sh="\${SHELL} $am_aux_dir/install-sh"
10061    esac
10062   fi
10063 < AC_SUBST(install_sh)])
10063 > AC_SUBST([install_sh])])
10064  
10065 < # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
10065 > # Copyright (C) 2003-2013 Free Software Foundation, Inc.
10066   #
10067   # This file is free software; the Free Software Foundation
10068   # gives unlimited permission to copy and/or distribute it,
10069   # with or without modifications, as long as this notice is preserved.
10070  
10073 # serial 2
10074
10071   # Check whether the underlying file-system supports filenames
10072   # with a leading dot.  For instance MS-DOS doesn't.
10073   AC_DEFUN([AM_SET_LEADING_DOT],
# Line 10085 | Line 10081 | fi
10081   rmdir .tst 2>/dev/null
10082   AC_SUBST([am__leading_dot])])
10083  
10084 < # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
10089 < # Free Software Foundation, Inc.
10084 > # Copyright (C) 1998-2013 Free Software Foundation, Inc.
10085   #
10086   # This file is free software; the Free Software Foundation
10087   # gives unlimited permission to copy and/or distribute it,
10088   # with or without modifications, as long as this notice is preserved.
10089  
10095 # serial 5
10096
10090   # AM_PROG_LEX
10091   # -----------
10092   # Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
10093   # "missing" invocation, for better error output.
10094   AC_DEFUN([AM_PROG_LEX],
10095 < [AC_PREREQ(2.50)dnl
10095 > [AC_PREREQ([2.50])dnl
10096   AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
10097   AC_REQUIRE([AC_PROG_LEX])dnl
10098   if test "$LEX" = :; then
# Line 10109 | Line 10102 | fi])
10102   # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
10103   # From Jim Meyering
10104  
10105 < # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
10113 < # 2011 Free Software Foundation, Inc.
10105 > # Copyright (C) 1996-2013 Free Software Foundation, Inc.
10106   #
10107   # This file is free software; the Free Software Foundation
10108   # gives unlimited permission to copy and/or distribute it,
10109   # with or without modifications, as long as this notice is preserved.
10110  
10119 # serial 5
10120
10111   # AM_MAINTAINER_MODE([DEFAULT-MODE])
10112   # ----------------------------------
10113   # Control maintainer-specific portions of Makefiles.
10114 < # Default is to disable them, unless `enable' is passed literally.
10115 < # For symmetry, `disable' may be passed as well.  Anyway, the user
10114 > # Default is to disable them, unless 'enable' is passed literally.
10115 > # For symmetry, 'disable' may be passed as well.  Anyway, the user
10116   # can override the default with the --enable/--disable switch.
10117   AC_DEFUN([AM_MAINTAINER_MODE],
10118   [m4_case(m4_default([$1], [disable]),
# Line 10133 | Line 10123 | AC_DEFUN([AM_MAINTAINER_MODE],
10123   AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
10124    dnl maintainer-mode's default is 'disable' unless 'enable' is passed
10125    AC_ARG_ENABLE([maintainer-mode],
10126 < [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
10127 <                          (and sometimes confusing) to the casual installer],
10128 <      [USE_MAINTAINER_MODE=$enableval],
10129 <      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
10126 >    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
10127 >      am_maintainer_other[ make rules and dependencies not useful
10128 >      (and sometimes confusing) to the casual installer])],
10129 >    [USE_MAINTAINER_MODE=$enableval],
10130 >    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
10131    AC_MSG_RESULT([$USE_MAINTAINER_MODE])
10132    AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
10133    MAINT=$MAINTAINER_MODE_TRUE
# Line 10144 | Line 10135 | AC_MSG_CHECKING([whether to enable maint
10135   ]
10136   )
10137  
10147 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
10148
10138   # Check to see how 'make' treats includes.                  -*- Autoconf -*-
10139  
10140 < # Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
10140 > # Copyright (C) 2001-2013 Free Software Foundation, Inc.
10141   #
10142   # This file is free software; the Free Software Foundation
10143   # gives unlimited permission to copy and/or distribute it,
10144   # with or without modifications, as long as this notice is preserved.
10145  
10157 # serial 4
10158
10146   # AM_MAKE_INCLUDE()
10147   # -----------------
10148   # Check to see how make treats includes.
# Line 10173 | Line 10160 | am__quote=
10160   _am_result=none
10161   # First try GNU make style include.
10162   echo "include confinc" > confmf
10163 < # Ignore all kinds of additional output from `make'.
10163 > # Ignore all kinds of additional output from 'make'.
10164   case `$am_make -s -f confmf 2> /dev/null` in #(
10165   *the\ am__doit\ target*)
10166    am__include=include
# Line 10200 | Line 10187 | rm -f confinc confmf
10187  
10188   # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
10189  
10190 < # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
10204 < # Free Software Foundation, Inc.
10190 > # Copyright (C) 1997-2013 Free Software Foundation, Inc.
10191   #
10192   # This file is free software; the Free Software Foundation
10193   # gives unlimited permission to copy and/or distribute it,
10194   # with or without modifications, as long as this notice is preserved.
10195  
10210 # serial 6
10211
10196   # AM_MISSING_PROG(NAME, PROGRAM)
10197   # ------------------------------
10198   AC_DEFUN([AM_MISSING_PROG],
# Line 10216 | Line 10200 | AC_DEFUN([AM_MISSING_PROG],
10200   $1=${$1-"${am_missing_run}$2"}
10201   AC_SUBST($1)])
10202  
10219
10203   # AM_MISSING_HAS_RUN
10204   # ------------------
10205 < # Define MISSING if not defined so far and test if it supports --run.
10206 < # If it does, set am_missing_run to use it, otherwise, to nothing.
10205 > # Define MISSING if not defined so far and test if it is modern enough.
10206 > # If it is, set am_missing_run to use it, otherwise, to nothing.
10207   AC_DEFUN([AM_MISSING_HAS_RUN],
10208   [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
10209   AC_REQUIRE_AUX_FILE([missing])dnl
# Line 10233 | Line 10216 | if test x"${MISSING+set}" != xset; then
10216    esac
10217   fi
10218   # Use eval to expand $SHELL
10219 < if eval "$MISSING --run true"; then
10220 <  am_missing_run="$MISSING --run "
10219 > if eval "$MISSING --is-lightweight"; then
10220 >  am_missing_run="$MISSING "
10221   else
10222    am_missing_run=
10223 <  AC_MSG_WARN([`missing' script is too old or missing])
10223 >  AC_MSG_WARN(['missing' script is too old or missing])
10224   fi
10225   ])
10226  
10244 # Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
10245 # Inc.
10246 #
10247 # This file is free software; the Free Software Foundation
10248 # gives unlimited permission to copy and/or distribute it,
10249 # with or without modifications, as long as this notice is preserved.
10250
10251 # serial 1
10252
10253 # AM_PROG_MKDIR_P
10254 # ---------------
10255 # Check for `mkdir -p'.
10256 AC_DEFUN([AM_PROG_MKDIR_P],
10257 [AC_PREREQ([2.60])dnl
10258 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
10259 dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
10260 dnl while keeping a definition of mkdir_p for backward compatibility.
10261 dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
10262 dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
10263 dnl Makefile.ins that do not define MKDIR_P, so we do our own
10264 dnl adjustment using top_builddir (which is defined more often than
10265 dnl MKDIR_P).
10266 AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
10267 case $mkdir_p in
10268  [[\\/$]]* | ?:[[\\/]]*) ;;
10269  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
10270 esac
10271 ])
10272
10227   # Helper functions for option handling.                     -*- Autoconf -*-
10228  
10229 < # Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
10276 < # Foundation, Inc.
10229 > # Copyright (C) 2001-2013 Free Software Foundation, Inc.
10230   #
10231   # This file is free software; the Free Software Foundation
10232   # gives unlimited permission to copy and/or distribute it,
10233   # with or without modifications, as long as this notice is preserved.
10234  
10282 # serial 5
10283
10235   # _AM_MANGLE_OPTION(NAME)
10236   # -----------------------
10237   AC_DEFUN([_AM_MANGLE_OPTION],
# Line 10290 | Line 10241 | AC_DEFUN([_AM_MANGLE_OPTION],
10241   # --------------------
10242   # Set option NAME.  Presently that only means defining a flag for this option.
10243   AC_DEFUN([_AM_SET_OPTION],
10244 < [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
10244 > [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
10245  
10246   # _AM_SET_OPTIONS(OPTIONS)
10247   # ------------------------
# Line 10306 | Line 10257 | AC_DEFUN([_AM_IF_OPTION],
10257  
10258   # Check to make sure that the build environment is sane.    -*- Autoconf -*-
10259  
10260 < # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
10310 < # Free Software Foundation, Inc.
10260 > # Copyright (C) 1996-2013 Free Software Foundation, Inc.
10261   #
10262   # This file is free software; the Free Software Foundation
10263   # gives unlimited permission to copy and/or distribute it,
10264   # with or without modifications, as long as this notice is preserved.
10265  
10316 # serial 5
10317
10266   # AM_SANITY_CHECK
10267   # ---------------
10268   AC_DEFUN([AM_SANITY_CHECK],
10269   [AC_MSG_CHECKING([whether build environment is sane])
10322 # Just in case
10323 sleep 1
10324 echo timestamp > conftest.file
10270   # Reject unsafe characters in $srcdir or the absolute working directory
10271   # name.  Accept space and tab only in the latter.
10272   am_lf='
# Line 10332 | Line 10277 | case `pwd` in
10277   esac
10278   case $srcdir in
10279    *[[\\\"\#\$\&\'\`$am_lf\ \    ]]*)
10280 <    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
10280 >    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
10281   esac
10282  
10283 < # Do `set' in a subshell so we don't clobber the current shell's
10283 > # Do 'set' in a subshell so we don't clobber the current shell's
10284   # arguments.  Must try -L first in case configure is actually a
10285   # symlink; some systems play weird games with the mod time of symlinks
10286   # (eg FreeBSD returns the mod time of the symlink's containing
10287   # directory).
10288   if (
10289 <   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
10290 <   if test "$[*]" = "X"; then
10291 <      # -L didn't work.
10292 <      set X `ls -t "$srcdir/configure" conftest.file`
10293 <   fi
10294 <   rm -f conftest.file
10295 <   if test "$[*]" != "X $srcdir/configure conftest.file" \
10296 <      && test "$[*]" != "X conftest.file $srcdir/configure"; then
10297 <
10298 <      # If neither matched, then we have a broken ls.  This can happen
10354 <      # if, for instance, CONFIG_SHELL is bash and it inherits a
10355 <      # broken ls alias from the environment.  This has actually
10356 <      # happened.  Such a system could not be considered "sane".
10357 <      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
10358 < alias in your environment])
10359 <   fi
10289 >   am_has_slept=no
10290 >   for am_try in 1 2; do
10291 >     echo "timestamp, slept: $am_has_slept" > conftest.file
10292 >     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
10293 >     if test "$[*]" = "X"; then
10294 >        # -L didn't work.
10295 >        set X `ls -t "$srcdir/configure" conftest.file`
10296 >     fi
10297 >     if test "$[*]" != "X $srcdir/configure conftest.file" \
10298 >        && test "$[*]" != "X conftest.file $srcdir/configure"; then
10299  
10300 +        # If neither matched, then we have a broken ls.  This can happen
10301 +        # if, for instance, CONFIG_SHELL is bash and it inherits a
10302 +        # broken ls alias from the environment.  This has actually
10303 +        # happened.  Such a system could not be considered "sane".
10304 +        AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
10305 +  alias in your environment])
10306 +     fi
10307 +     if test "$[2]" = conftest.file || test $am_try -eq 2; then
10308 +       break
10309 +     fi
10310 +     # Just in case.
10311 +     sleep 1
10312 +     am_has_slept=yes
10313 +   done
10314     test "$[2]" = conftest.file
10315     )
10316   then
# Line 10367 | Line 10320 | else
10320     AC_MSG_ERROR([newly created file is older than distributed files!
10321   Check your system clock])
10322   fi
10323 < AC_MSG_RESULT(yes)])
10323 > AC_MSG_RESULT([yes])
10324 > # If we didn't sleep, we still need to ensure time stamps of config.status and
10325 > # generated files are strictly newer.
10326 > am_sleep_pid=
10327 > if grep 'slept: no' conftest.file >/dev/null 2>&1; then
10328 >  ( sleep 1 ) &
10329 >  am_sleep_pid=$!
10330 > fi
10331 > AC_CONFIG_COMMANDS_PRE(
10332 >  [AC_MSG_CHECKING([that generated files are newer than configure])
10333 >   if test -n "$am_sleep_pid"; then
10334 >     # Hide warnings about reused PIDs.
10335 >     wait $am_sleep_pid 2>/dev/null
10336 >   fi
10337 >   AC_MSG_RESULT([done])])
10338 > rm -f conftest.file
10339 > ])
10340  
10341 < # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
10341 > # Copyright (C) 2009-2013 Free Software Foundation, Inc.
10342   #
10343   # This file is free software; the Free Software Foundation
10344   # gives unlimited permission to copy and/or distribute it,
10345   # with or without modifications, as long as this notice is preserved.
10346  
10347 < # serial 1
10347 > # AM_SILENT_RULES([DEFAULT])
10348 > # --------------------------
10349 > # Enable less verbose build rules; with the default set to DEFAULT
10350 > # ("yes" being less verbose, "no" or empty being verbose).
10351 > AC_DEFUN([AM_SILENT_RULES],
10352 > [AC_ARG_ENABLE([silent-rules], [dnl
10353 > AS_HELP_STRING(
10354 >  [--enable-silent-rules],
10355 >  [less verbose build output (undo: "make V=1")])
10356 > AS_HELP_STRING(
10357 >  [--disable-silent-rules],
10358 >  [verbose build output (undo: "make V=0")])dnl
10359 > ])
10360 > case $enable_silent_rules in @%:@ (((
10361 >  yes) AM_DEFAULT_VERBOSITY=0;;
10362 >   no) AM_DEFAULT_VERBOSITY=1;;
10363 >    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
10364 > esac
10365 > dnl
10366 > dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
10367 > dnl do not support nested variable expansions.
10368 > dnl See automake bug#9928 and bug#10237.
10369 > am_make=${MAKE-make}
10370 > AC_CACHE_CHECK([whether $am_make supports nested variables],
10371 >   [am_cv_make_support_nested_variables],
10372 >   [if AS_ECHO([['TRUE=$(BAR$(V))
10373 > BAR0=false
10374 > BAR1=true
10375 > V=1
10376 > am__doit:
10377 >        @$(TRUE)
10378 > .PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
10379 >  am_cv_make_support_nested_variables=yes
10380 > else
10381 >  am_cv_make_support_nested_variables=no
10382 > fi])
10383 > if test $am_cv_make_support_nested_variables = yes; then
10384 >  dnl Using '$V' instead of '$(V)' breaks IRIX make.
10385 >  AM_V='$(V)'
10386 >  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
10387 > else
10388 >  AM_V=$AM_DEFAULT_VERBOSITY
10389 >  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
10390 > fi
10391 > AC_SUBST([AM_V])dnl
10392 > AM_SUBST_NOTMAKE([AM_V])dnl
10393 > AC_SUBST([AM_DEFAULT_V])dnl
10394 > AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
10395 > AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
10396 > AM_BACKSLASH='\'
10397 > AC_SUBST([AM_BACKSLASH])dnl
10398 > _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
10399 > ])
10400 >
10401 > # Copyright (C) 2001-2013 Free Software Foundation, Inc.
10402 > #
10403 > # This file is free software; the Free Software Foundation
10404 > # gives unlimited permission to copy and/or distribute it,
10405 > # with or without modifications, as long as this notice is preserved.
10406  
10407   # AM_PROG_INSTALL_STRIP
10408   # ---------------------
10409 < # One issue with vendor `install' (even GNU) is that you can't
10409 > # One issue with vendor 'install' (even GNU) is that you can't
10410   # specify the program used to strip binaries.  This is especially
10411   # annoying in cross-compiling environments, where the build's strip
10412   # is unlikely to handle the host's binaries.
10413   # Fortunately install-sh will honor a STRIPPROG variable, so we
10414 < # always use install-sh in `make install-strip', and initialize
10414 > # always use install-sh in "make install-strip", and initialize
10415   # STRIPPROG with the value of the STRIP variable (set by the user).
10416   AC_DEFUN([AM_PROG_INSTALL_STRIP],
10417   [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
10418 < # Installed binaries are usually stripped using `strip' when the user
10419 < # run `make install-strip'.  However `strip' might not be the right
10418 > # Installed binaries are usually stripped using 'strip' when the user
10419 > # run "make install-strip".  However 'strip' might not be the right
10420   # tool to use in cross-compilation environments, therefore Automake
10421 < # will honor the `STRIP' environment variable to overrule this program.
10422 < dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
10421 > # will honor the 'STRIP' environment variable to overrule this program.
10422 > dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
10423   if test "$cross_compiling" != no; then
10424    AC_CHECK_TOOL([STRIP], [strip], :)
10425   fi
10426   INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
10427   AC_SUBST([INSTALL_STRIP_PROGRAM])])
10428  
10429 < # Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
10429 > # Copyright (C) 2006-2013 Free Software Foundation, Inc.
10430   #
10431   # This file is free software; the Free Software Foundation
10432   # gives unlimited permission to copy and/or distribute it,
10433   # with or without modifications, as long as this notice is preserved.
10434  
10408 # serial 3
10409
10435   # _AM_SUBST_NOTMAKE(VARIABLE)
10436   # ---------------------------
10437   # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# Line 10420 | Line 10445 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_
10445  
10446   # Check how to create a tarball.                            -*- Autoconf -*-
10447  
10448 < # Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
10448 > # Copyright (C) 2004-2013 Free Software Foundation, Inc.
10449   #
10450   # This file is free software; the Free Software Foundation
10451   # gives unlimited permission to copy and/or distribute it,
10452   # with or without modifications, as long as this notice is preserved.
10453  
10429 # serial 2
10430
10454   # _AM_PROG_TAR(FORMAT)
10455   # --------------------
10456   # Check how to create a tarball in format FORMAT.
10457 < # FORMAT should be one of `v7', `ustar', or `pax'.
10457 > # FORMAT should be one of 'v7', 'ustar', or 'pax'.
10458   #
10459   # Substitute a variable $(am__tar) that is a command
10460   # writing to stdout a FORMAT-tarball containing the directory
# Line 10441 | Line 10464 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_
10464   # Substitute a variable $(am__untar) that extract such
10465   # a tarball read from stdin.
10466   #     $(am__untar) < result.tar
10467 + #
10468   AC_DEFUN([_AM_PROG_TAR],
10469   [# Always define AMTAR for backward compatibility.  Yes, it's still used
10470   # in the wild :-(  We should find a proper way to deprecate it ...
10471   AC_SUBST([AMTAR], ['$${TAR-tar}'])
10472 < m4_if([$1], [v7],
10473 <     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
10450 <     [m4_case([$1], [ustar],, [pax],,
10451 <              [m4_fatal([Unknown tar format])])
10452 < AC_MSG_CHECKING([how to create a $1 tar archive])
10453 < # Loop over all known methods to create a tar archive until one works.
10472 >
10473 > # We'll loop over all known methods to create a tar archive until one works.
10474   _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
10455 _am_tools=${am_cv_prog_tar_$1-$_am_tools}
10456 # Do not fold the above two line into one, because Tru64 sh and
10457 # Solaris sh will not grok spaces in the rhs of `-'.
10458 for _am_tool in $_am_tools
10459 do
10460  case $_am_tool in
10461  gnutar)
10462    for _am_tar in tar gnutar gtar;
10463    do
10464      AM_RUN_LOG([$_am_tar --version]) && break
10465    done
10466    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
10467    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
10468    am__untar="$_am_tar -xf -"
10469    ;;
10470  plaintar)
10471    # Must skip GNU tar: if it does not support --format= it doesn't create
10472    # ustar tarball either.
10473    (tar --version) >/dev/null 2>&1 && continue
10474    am__tar='tar chf - "$$tardir"'
10475    am__tar_='tar chf - "$tardir"'
10476    am__untar='tar xf -'
10477    ;;
10478  pax)
10479    am__tar='pax -L -x $1 -w "$$tardir"'
10480    am__tar_='pax -L -x $1 -w "$tardir"'
10481    am__untar='pax -r'
10482    ;;
10483  cpio)
10484    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
10485    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
10486    am__untar='cpio -i -H $1 -d'
10487    ;;
10488  none)
10489    am__tar=false
10490    am__tar_=false
10491    am__untar=false
10492    ;;
10493  esac
10475  
10476 <  # If the value was cached, stop now.  We just wanted to have am__tar
10477 <  # and am__untar set.
10497 <  test -n "${am_cv_prog_tar_$1}" && break
10476 > m4_if([$1], [v7],
10477 >  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
10478  
10479 <  # tar/untar a dummy directory, and stop if the command works
10480 <  rm -rf conftest.dir
10481 <  mkdir conftest.dir
10482 <  echo GrepMe > conftest.dir/file
10483 <  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
10479 >  [m4_case([$1],
10480 >    [ustar],
10481 >     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
10482 >      # There is notably a 21 bits limit for the UID and the GID.  In fact,
10483 >      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
10484 >      # and bug#13588).
10485 >      am_max_uid=2097151 # 2^21 - 1
10486 >      am_max_gid=$am_max_uid
10487 >      # The $UID and $GID variables are not portable, so we need to resort
10488 >      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
10489 >      # below are definitely unexpected, so allow the users to see them
10490 >      # (that is, avoid stderr redirection).
10491 >      am_uid=`id -u || echo unknown`
10492 >      am_gid=`id -g || echo unknown`
10493 >      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
10494 >      if test $am_uid -le $am_max_uid; then
10495 >         AC_MSG_RESULT([yes])
10496 >      else
10497 >         AC_MSG_RESULT([no])
10498 >         _am_tools=none
10499 >      fi
10500 >      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
10501 >      if test $am_gid -le $am_max_gid; then
10502 >         AC_MSG_RESULT([yes])
10503 >      else
10504 >        AC_MSG_RESULT([no])
10505 >        _am_tools=none
10506 >      fi],
10507 >
10508 >  [pax],
10509 >    [],
10510 >
10511 >  [m4_fatal([Unknown tar format])])
10512 >
10513 >  AC_MSG_CHECKING([how to create a $1 tar archive])
10514 >
10515 >  # Go ahead even if we have the value already cached.  We do so because we
10516 >  # need to set the values for the 'am__tar' and 'am__untar' variables.
10517 >  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
10518 >
10519 >  for _am_tool in $_am_tools; do
10520 >    case $_am_tool in
10521 >    gnutar)
10522 >      for _am_tar in tar gnutar gtar; do
10523 >        AM_RUN_LOG([$_am_tar --version]) && break
10524 >      done
10525 >      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
10526 >      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
10527 >      am__untar="$_am_tar -xf -"
10528 >      ;;
10529 >    plaintar)
10530 >      # Must skip GNU tar: if it does not support --format= it doesn't create
10531 >      # ustar tarball either.
10532 >      (tar --version) >/dev/null 2>&1 && continue
10533 >      am__tar='tar chf - "$$tardir"'
10534 >      am__tar_='tar chf - "$tardir"'
10535 >      am__untar='tar xf -'
10536 >      ;;
10537 >    pax)
10538 >      am__tar='pax -L -x $1 -w "$$tardir"'
10539 >      am__tar_='pax -L -x $1 -w "$tardir"'
10540 >      am__untar='pax -r'
10541 >      ;;
10542 >    cpio)
10543 >      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
10544 >      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
10545 >      am__untar='cpio -i -H $1 -d'
10546 >      ;;
10547 >    none)
10548 >      am__tar=false
10549 >      am__tar_=false
10550 >      am__untar=false
10551 >      ;;
10552 >    esac
10553 >
10554 >    # If the value was cached, stop now.  We just wanted to have am__tar
10555 >    # and am__untar set.
10556 >    test -n "${am_cv_prog_tar_$1}" && break
10557 >
10558 >    # tar/untar a dummy directory, and stop if the command works.
10559 >    rm -rf conftest.dir
10560 >    mkdir conftest.dir
10561 >    echo GrepMe > conftest.dir/file
10562 >    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
10563 >    rm -rf conftest.dir
10564 >    if test -s conftest.tar; then
10565 >      AM_RUN_LOG([$am__untar <conftest.tar])
10566 >      AM_RUN_LOG([cat conftest.dir/file])
10567 >      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
10568 >    fi
10569 >  done
10570    rm -rf conftest.dir
10505  if test -s conftest.tar; then
10506    AM_RUN_LOG([$am__untar <conftest.tar])
10507    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
10508  fi
10509 done
10510 rm -rf conftest.dir
10571  
10572 < AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
10573 < AC_MSG_RESULT([$am_cv_prog_tar_$1])])
10572 >  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
10573 >  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
10574 >
10575   AC_SUBST([am__tar])
10576   AC_SUBST([am__untar])
10577   ]) # _AM_PROG_TAR

Comparing:
ircd-hybrid-8/aclocal.m4 (property svn:eol-style), Revision 1291 by michael, Sun Feb 12 20:24:41 2012 UTC vs.
ircd-hybrid/trunk/aclocal.m4 (property svn:eol-style), Revision 2178 by michael, Mon Jun 3 23:56:42 2013 UTC

# Line 0 | Line 1
1 + native

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)