1.1 --- a/aclocal.m4 Fri Mar 28 16:21:31 2014 +0000
1.2 +++ b/aclocal.m4 Sat Mar 29 13:10:05 2014 +0000
1.3 @@ -1,7 +1,8 @@
1.4 -# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
1.5 +# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
1.6
1.7 -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1.8 -
1.9 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
1.10 +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
1.11 +# Inc.
1.12 # This file is free software; the Free Software Foundation
1.13 # gives unlimited permission to copy and/or distribute it,
1.14 # with or without modifications, as long as this notice is preserved.
1.15 @@ -11,31 +12,33 @@
1.16 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1.17 # PARTICULAR PURPOSE.
1.18
1.19 -m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
1.20 m4_ifndef([AC_AUTOCONF_VERSION],
1.21 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1.22 -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
1.23 -[m4_warning([this file was generated for autoconf 2.69.
1.24 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
1.25 +[m4_warning([this file was generated for autoconf 2.68.
1.26 You have another version of autoconf. It may work, but is not guaranteed to.
1.27 If you have problems, you may need to regenerate the build system entirely.
1.28 -To do so, use the procedure documented by the package, typically 'autoreconf'.])])
1.29 +To do so, use the procedure documented by the package, typically `autoreconf'.])])
1.30
1.31 -# Copyright (C) 2002-2013 Free Software Foundation, Inc.
1.32 +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
1.33 +# Foundation, Inc.
1.34 #
1.35 # This file is free software; the Free Software Foundation
1.36 # gives unlimited permission to copy and/or distribute it,
1.37 # with or without modifications, as long as this notice is preserved.
1.38
1.39 +# serial 1
1.40 +
1.41 # AM_AUTOMAKE_VERSION(VERSION)
1.42 # ----------------------------
1.43 # Automake X.Y traces this macro to ensure aclocal.m4 has been
1.44 # generated from the m4 files accompanying Automake X.Y.
1.45 # (This private macro should not be called outside this file.)
1.46 AC_DEFUN([AM_AUTOMAKE_VERSION],
1.47 -[am__api_version='1.13'
1.48 +[am__api_version='1.11'
1.49 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
1.50 dnl require some minimum version. Point them to the right macro.
1.51 -m4_if([$1], [1.13.3], [],
1.52 +m4_if([$1], [1.11.3], [],
1.53 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
1.54 ])
1.55
1.56 @@ -51,22 +54,24 @@
1.57 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
1.58 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
1.59 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
1.60 -[AM_AUTOMAKE_VERSION([1.13.3])dnl
1.61 +[AM_AUTOMAKE_VERSION([1.11.3])dnl
1.62 m4_ifndef([AC_AUTOCONF_VERSION],
1.63 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1.64 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
1.65
1.66 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
1.67
1.68 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1.69 +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
1.70 #
1.71 # This file is free software; the Free Software Foundation
1.72 # gives unlimited permission to copy and/or distribute it,
1.73 # with or without modifications, as long as this notice is preserved.
1.74
1.75 +# serial 1
1.76 +
1.77 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
1.78 -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
1.79 -# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
1.80 +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
1.81 +# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
1.82 #
1.83 # Of course, Automake must honor this variable whenever it calls a
1.84 # tool from the auxiliary directory. The problem is that $srcdir (and
1.85 @@ -85,7 +90,7 @@
1.86 #
1.87 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
1.88 # are both prefixed by $srcdir. In an in-source build this is usually
1.89 -# harmless because $srcdir is '.', but things will broke when you
1.90 +# harmless because $srcdir is `.', but things will broke when you
1.91 # start a VPATH build or use an absolute $srcdir.
1.92 #
1.93 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
1.94 @@ -111,19 +116,22 @@
1.95
1.96 # AM_CONDITIONAL -*- Autoconf -*-
1.97
1.98 -# Copyright (C) 1997-2013 Free Software Foundation, Inc.
1.99 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
1.100 +# Free Software Foundation, Inc.
1.101 #
1.102 # This file is free software; the Free Software Foundation
1.103 # gives unlimited permission to copy and/or distribute it,
1.104 # with or without modifications, as long as this notice is preserved.
1.105
1.106 +# serial 9
1.107 +
1.108 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
1.109 # -------------------------------------
1.110 # Define a conditional.
1.111 AC_DEFUN([AM_CONDITIONAL],
1.112 -[AC_PREREQ([2.52])dnl
1.113 - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
1.114 - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
1.115 +[AC_PREREQ(2.52)dnl
1.116 + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
1.117 + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
1.118 AC_SUBST([$1_TRUE])dnl
1.119 AC_SUBST([$1_FALSE])dnl
1.120 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
1.121 @@ -142,14 +150,16 @@
1.122 Usually this means the macro was only invoked conditionally.]])
1.123 fi])])
1.124
1.125 -# Copyright (C) 1999-2013 Free Software Foundation, Inc.
1.126 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
1.127 +# 2010, 2011 Free Software Foundation, Inc.
1.128 #
1.129 # This file is free software; the Free Software Foundation
1.130 # gives unlimited permission to copy and/or distribute it,
1.131 # with or without modifications, as long as this notice is preserved.
1.132
1.133 +# serial 12
1.134
1.135 -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
1.136 +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
1.137 # written in clear, in which case automake, when reading aclocal.m4,
1.138 # will think it sees a *use*, and therefore will trigger all it's
1.139 # C support machinery. Also note that it means that autoscan, seeing
1.140 @@ -159,7 +169,7 @@
1.141 # _AM_DEPENDENCIES(NAME)
1.142 # ----------------------
1.143 # See how the compiler implements dependency checking.
1.144 -# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
1.145 +# NAME is "CC", "CXX", "GCJ", or "OBJC".
1.146 # We try a few techniques and use that to set a single cache variable.
1.147 #
1.148 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
1.149 @@ -172,13 +182,12 @@
1.150 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
1.151 AC_REQUIRE([AM_DEP_TRACK])dnl
1.152
1.153 -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
1.154 - [$1], [CXX], [depcc="$CXX" am_compiler_list=],
1.155 - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
1.156 - [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
1.157 - [$1], [UPC], [depcc="$UPC" am_compiler_list=],
1.158 - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
1.159 - [depcc="$$1" am_compiler_list=])
1.160 +ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
1.161 + [$1], CXX, [depcc="$CXX" am_compiler_list=],
1.162 + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
1.163 + [$1], UPC, [depcc="$UPC" am_compiler_list=],
1.164 + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
1.165 + [depcc="$$1" am_compiler_list=])
1.166
1.167 AC_CACHE_CHECK([dependency style of $depcc],
1.168 [am_cv_$1_dependencies_compiler_type],
1.169 @@ -186,8 +195,8 @@
1.170 # We make a subdir and do the tests there. Otherwise we can end up
1.171 # making bogus files that we don't know about and never remove. For
1.172 # instance it was reported that on HP-UX the gcc test will end up
1.173 - # making a dummy file named 'D' -- because '-MD' means "put the output
1.174 - # in D".
1.175 + # making a dummy file named `D' -- because `-MD' means `put the output
1.176 + # in D'.
1.177 rm -rf conftest.dir
1.178 mkdir conftest.dir
1.179 # Copy depcomp to subdir because otherwise we won't find it if we're
1.180 @@ -227,16 +236,16 @@
1.181 : > sub/conftest.c
1.182 for i in 1 2 3 4 5 6; do
1.183 echo '#include "conftst'$i'.h"' >> sub/conftest.c
1.184 - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
1.185 - # Solaris 10 /bin/sh.
1.186 - echo '/* dummy */' > sub/conftst$i.h
1.187 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
1.188 + # Solaris 8's {/usr,}/bin/sh.
1.189 + touch sub/conftst$i.h
1.190 done
1.191 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
1.192
1.193 - # We check with '-c' and '-o' for the sake of the "dashmstdout"
1.194 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
1.195 # mode. It turns out that the SunPro C++ compiler does not properly
1.196 - # handle '-M -o', and we need to detect this. Also, some Intel
1.197 - # versions had trouble with output in subdirs.
1.198 + # handle `-M -o', and we need to detect this. Also, some Intel
1.199 + # versions had trouble with output in subdirs
1.200 am__obj=sub/conftest.${OBJEXT-o}
1.201 am__minus_obj="-o $am__obj"
1.202 case $depmode in
1.203 @@ -245,8 +254,8 @@
1.204 test "$am__universal" = false || continue
1.205 ;;
1.206 nosideeffect)
1.207 - # After this tag, mechanisms are not by side-effect, so they'll
1.208 - # only be used when explicitly requested.
1.209 + # after this tag, mechanisms are not by side-effect, so they'll
1.210 + # only be used when explicitly requested
1.211 if test "x$enable_dependency_tracking" = xyes; then
1.212 continue
1.213 else
1.214 @@ -254,7 +263,7 @@
1.215 fi
1.216 ;;
1.217 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
1.218 - # This compiler won't grok '-c -o', but also, the minuso test has
1.219 + # This compiler won't grok `-c -o', but also, the minuso test has
1.220 # not run yet. These depmodes are late enough in the game, and
1.221 # so weak that their functioning should not be impacted.
1.222 am__obj=conftest.${OBJEXT-o}
1.223 @@ -302,7 +311,7 @@
1.224 # AM_SET_DEPDIR
1.225 # -------------
1.226 # Choose a directory name for dependency files.
1.227 -# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
1.228 +# This macro is AC_REQUIREd in _AM_DEPENDENCIES
1.229 AC_DEFUN([AM_SET_DEPDIR],
1.230 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
1.231 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
1.232 @@ -312,13 +321,9 @@
1.233 # AM_DEP_TRACK
1.234 # ------------
1.235 AC_DEFUN([AM_DEP_TRACK],
1.236 -[AC_ARG_ENABLE([dependency-tracking], [dnl
1.237 -AS_HELP_STRING(
1.238 - [--enable-dependency-tracking],
1.239 - [do not reject slow dependency extractors])
1.240 -AS_HELP_STRING(
1.241 - [--disable-dependency-tracking],
1.242 - [speeds up one-time build])])
1.243 +[AC_ARG_ENABLE(dependency-tracking,
1.244 +[ --disable-dependency-tracking speeds up one-time build
1.245 + --enable-dependency-tracking do not reject slow dependency extractors])
1.246 if test "x$enable_dependency_tracking" != xno; then
1.247 am_depcomp="$ac_aux_dir/depcomp"
1.248 AMDEPBACKSLASH='\'
1.249 @@ -333,18 +338,20 @@
1.250
1.251 # Generate code to set up dependency tracking. -*- Autoconf -*-
1.252
1.253 -# Copyright (C) 1999-2013 Free Software Foundation, Inc.
1.254 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
1.255 +# Free Software Foundation, Inc.
1.256 #
1.257 # This file is free software; the Free Software Foundation
1.258 # gives unlimited permission to copy and/or distribute it,
1.259 # with or without modifications, as long as this notice is preserved.
1.260
1.261 +#serial 5
1.262
1.263 # _AM_OUTPUT_DEPENDENCY_COMMANDS
1.264 # ------------------------------
1.265 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
1.266 [{
1.267 - # Older Autoconf quotes --file arguments for eval, but not when files
1.268 + # Autoconf 2.62 quotes --file arguments for eval, but not when files
1.269 # are listed without --file. Let's play safe and only enable the eval
1.270 # if we detect the quoting.
1.271 case $CONFIG_FILES in
1.272 @@ -357,7 +364,7 @@
1.273 # Strip MF so we end up with the name of the file.
1.274 mf=`echo "$mf" | sed -e 's/:.*$//'`
1.275 # Check whether this is an Automake generated Makefile or not.
1.276 - # We used to match only the files named 'Makefile.in', but
1.277 + # We used to match only the files named `Makefile.in', but
1.278 # some people rename them; so instead we look at the file content.
1.279 # Grep'ing the first line is not enough: some people post-process
1.280 # each Makefile.in and add a new line on top of each file to say so.
1.281 @@ -369,19 +376,21 @@
1.282 continue
1.283 fi
1.284 # Extract the definition of DEPDIR, am__include, and am__quote
1.285 - # from the Makefile without running 'make'.
1.286 + # from the Makefile without running `make'.
1.287 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
1.288 test -z "$DEPDIR" && continue
1.289 am__include=`sed -n 's/^am__include = //p' < "$mf"`
1.290 - test -z "$am__include" && continue
1.291 + test -z "am__include" && continue
1.292 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
1.293 + # When using ansi2knr, U may be empty or an underscore; expand it
1.294 + U=`sed -n 's/^U = //p' < "$mf"`
1.295 # Find all dependency output files, they are included files with
1.296 # $(DEPDIR) in their names. We invoke sed twice because it is the
1.297 # simplest approach to changing $(DEPDIR) to its actual value in the
1.298 # expansion.
1.299 for file in `sed -n "
1.300 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
1.301 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
1.302 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
1.303 # Make sure the directory exists.
1.304 test -f "$dirpart/$file" && continue
1.305 fdir=`AS_DIRNAME(["$file"])`
1.306 @@ -399,7 +408,7 @@
1.307 # This macro should only be invoked once -- use via AC_REQUIRE.
1.308 #
1.309 # This code is only required when automatic dependency tracking
1.310 -# is enabled. FIXME. This creates each '.P' file that we will
1.311 +# is enabled. FIXME. This creates each `.P' file that we will
1.312 # need in order to bootstrap the dependency handling code.
1.313 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
1.314 [AC_CONFIG_COMMANDS([depfiles],
1.315 @@ -407,14 +416,29 @@
1.316 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
1.317 ])
1.318
1.319 -# Do all the work for Automake. -*- Autoconf -*-
1.320 -
1.321 -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1.322 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
1.323 +# Free Software Foundation, Inc.
1.324 #
1.325 # This file is free software; the Free Software Foundation
1.326 # gives unlimited permission to copy and/or distribute it,
1.327 # with or without modifications, as long as this notice is preserved.
1.328
1.329 +# serial 8
1.330 +
1.331 +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
1.332 +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
1.333 +
1.334 +# Do all the work for Automake. -*- Autoconf -*-
1.335 +
1.336 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
1.337 +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
1.338 +#
1.339 +# This file is free software; the Free Software Foundation
1.340 +# gives unlimited permission to copy and/or distribute it,
1.341 +# with or without modifications, as long as this notice is preserved.
1.342 +
1.343 +# serial 16
1.344 +
1.345 # This macro actually does too much. Some checks are only needed if
1.346 # your package does certain things. But this isn't really a big deal.
1.347
1.348 @@ -430,7 +454,7 @@
1.349 # arguments mandatory, and then we can depend on a new Autoconf
1.350 # release and drop the old call support.
1.351 AC_DEFUN([AM_INIT_AUTOMAKE],
1.352 -[AC_PREREQ([2.65])dnl
1.353 +[AC_PREREQ([2.62])dnl
1.354 dnl Autoconf wants to disallow AM_ names. We explicitly allow
1.355 dnl the ones we care about.
1.356 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
1.357 @@ -459,40 +483,31 @@
1.358 # Define the identity of the package.
1.359 dnl Distinguish between old-style and new-style calls.
1.360 m4_ifval([$2],
1.361 -[AC_DIAGNOSE([obsolete],
1.362 - [$0: two- and three-arguments forms are deprecated.])
1.363 -m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
1.364 +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
1.365 AC_SUBST([PACKAGE], [$1])dnl
1.366 AC_SUBST([VERSION], [$2])],
1.367 [_AM_SET_OPTIONS([$1])dnl
1.368 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
1.369 -m4_if(
1.370 - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
1.371 - [ok:ok],,
1.372 +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
1.373 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
1.374 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
1.375 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
1.376
1.377 _AM_IF_OPTION([no-define],,
1.378 -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
1.379 - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
1.380 +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
1.381 + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
1.382
1.383 # Some tools Automake needs.
1.384 AC_REQUIRE([AM_SANITY_CHECK])dnl
1.385 AC_REQUIRE([AC_ARG_PROGRAM])dnl
1.386 -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
1.387 -AM_MISSING_PROG([AUTOCONF], [autoconf])
1.388 -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
1.389 -AM_MISSING_PROG([AUTOHEADER], [autoheader])
1.390 -AM_MISSING_PROG([MAKEINFO], [makeinfo])
1.391 +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
1.392 +AM_MISSING_PROG(AUTOCONF, autoconf)
1.393 +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
1.394 +AM_MISSING_PROG(AUTOHEADER, autoheader)
1.395 +AM_MISSING_PROG(MAKEINFO, makeinfo)
1.396 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1.397 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
1.398 -AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1.399 -# For better backward compatibility. To be removed once Automake 1.9.x
1.400 -# dies out for good. For more background, see:
1.401 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
1.402 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
1.403 -AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
1.404 +AC_REQUIRE([AM_PROG_MKDIR_P])dnl
1.405 # We need awk for the "check" target. The system "awk" is bad on
1.406 # some platforms.
1.407 AC_REQUIRE([AC_PROG_AWK])dnl
1.408 @@ -503,32 +518,28 @@
1.409 [_AM_PROG_TAR([v7])])])
1.410 _AM_IF_OPTION([no-dependencies],,
1.411 [AC_PROVIDE_IFELSE([AC_PROG_CC],
1.412 - [_AM_DEPENDENCIES([CC])],
1.413 - [m4_define([AC_PROG_CC],
1.414 - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
1.415 + [_AM_DEPENDENCIES(CC)],
1.416 + [define([AC_PROG_CC],
1.417 + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
1.418 AC_PROVIDE_IFELSE([AC_PROG_CXX],
1.419 - [_AM_DEPENDENCIES([CXX])],
1.420 - [m4_define([AC_PROG_CXX],
1.421 - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
1.422 + [_AM_DEPENDENCIES(CXX)],
1.423 + [define([AC_PROG_CXX],
1.424 + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
1.425 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
1.426 - [_AM_DEPENDENCIES([OBJC])],
1.427 - [m4_define([AC_PROG_OBJC],
1.428 - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
1.429 -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
1.430 - [_AM_DEPENDENCIES([OBJCXX])],
1.431 - [m4_define([AC_PROG_OBJCXX],
1.432 - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
1.433 + [_AM_DEPENDENCIES(OBJC)],
1.434 + [define([AC_PROG_OBJC],
1.435 + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
1.436 ])
1.437 -AC_REQUIRE([AM_SILENT_RULES])dnl
1.438 -dnl The testsuite driver may need to know about EXEEXT, so add the
1.439 -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
1.440 -dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
1.441 +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
1.442 +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
1.443 +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
1.444 +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
1.445 AC_CONFIG_COMMANDS_PRE(dnl
1.446 [m4_provide_if([_AM_COMPILER_EXEEXT],
1.447 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
1.448 ])
1.449
1.450 -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
1.451 +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
1.452 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
1.453 dnl mangled by Autoconf and run in a shell conditional statement.
1.454 m4_define([_AC_COMPILER_EXEEXT],
1.455 @@ -556,12 +567,15 @@
1.456 done
1.457 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
1.458
1.459 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1.460 +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
1.461 +# Inc.
1.462 #
1.463 # This file is free software; the Free Software Foundation
1.464 # gives unlimited permission to copy and/or distribute it,
1.465 # with or without modifications, as long as this notice is preserved.
1.466
1.467 +# serial 1
1.468 +
1.469 # AM_PROG_INSTALL_SH
1.470 # ------------------
1.471 # Define $install_sh.
1.472 @@ -575,14 +589,16 @@
1.473 install_sh="\${SHELL} $am_aux_dir/install-sh"
1.474 esac
1.475 fi
1.476 -AC_SUBST([install_sh])])
1.477 +AC_SUBST(install_sh)])
1.478
1.479 -# Copyright (C) 2003-2013 Free Software Foundation, Inc.
1.480 +# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
1.481 #
1.482 # This file is free software; the Free Software Foundation
1.483 # gives unlimited permission to copy and/or distribute it,
1.484 # with or without modifications, as long as this notice is preserved.
1.485
1.486 +# serial 2
1.487 +
1.488 # Check whether the underlying file-system supports filenames
1.489 # with a leading dot. For instance MS-DOS doesn't.
1.490 AC_DEFUN([AM_SET_LEADING_DOT],
1.491 @@ -599,17 +615,20 @@
1.492 # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
1.493 # From Jim Meyering
1.494
1.495 -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1.496 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
1.497 +# 2011 Free Software Foundation, Inc.
1.498 #
1.499 # This file is free software; the Free Software Foundation
1.500 # gives unlimited permission to copy and/or distribute it,
1.501 # with or without modifications, as long as this notice is preserved.
1.502
1.503 +# serial 5
1.504 +
1.505 # AM_MAINTAINER_MODE([DEFAULT-MODE])
1.506 # ----------------------------------
1.507 # Control maintainer-specific portions of Makefiles.
1.508 -# Default is to disable them, unless 'enable' is passed literally.
1.509 -# For symmetry, 'disable' may be passed as well. Anyway, the user
1.510 +# Default is to disable them, unless `enable' is passed literally.
1.511 +# For symmetry, `disable' may be passed as well. Anyway, the user
1.512 # can override the default with the --enable/--disable switch.
1.513 AC_DEFUN([AM_MAINTAINER_MODE],
1.514 [m4_case(m4_default([$1], [disable]),
1.515 @@ -620,11 +639,10 @@
1.516 AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
1.517 dnl maintainer-mode's default is 'disable' unless 'enable' is passed
1.518 AC_ARG_ENABLE([maintainer-mode],
1.519 - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
1.520 - am_maintainer_other[ make rules and dependencies not useful
1.521 - (and sometimes confusing) to the casual installer])],
1.522 - [USE_MAINTAINER_MODE=$enableval],
1.523 - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
1.524 +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
1.525 + (and sometimes confusing) to the casual installer],
1.526 + [USE_MAINTAINER_MODE=$enableval],
1.527 + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
1.528 AC_MSG_RESULT([$USE_MAINTAINER_MODE])
1.529 AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
1.530 MAINT=$MAINTAINER_MODE_TRUE
1.531 @@ -632,14 +650,18 @@
1.532 ]
1.533 )
1.534
1.535 +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
1.536 +
1.537 # Check to see how 'make' treats includes. -*- Autoconf -*-
1.538
1.539 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1.540 +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
1.541 #
1.542 # This file is free software; the Free Software Foundation
1.543 # gives unlimited permission to copy and/or distribute it,
1.544 # with or without modifications, as long as this notice is preserved.
1.545
1.546 +# serial 4
1.547 +
1.548 # AM_MAKE_INCLUDE()
1.549 # -----------------
1.550 # Check to see how make treats includes.
1.551 @@ -657,7 +679,7 @@
1.552 _am_result=none
1.553 # First try GNU make style include.
1.554 echo "include confinc" > confmf
1.555 -# Ignore all kinds of additional output from 'make'.
1.556 +# Ignore all kinds of additional output from `make'.
1.557 case `$am_make -s -f confmf 2> /dev/null` in #(
1.558 *the\ am__doit\ target*)
1.559 am__include=include
1.560 @@ -684,12 +706,15 @@
1.561
1.562 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
1.563
1.564 -# Copyright (C) 1997-2013 Free Software Foundation, Inc.
1.565 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
1.566 +# Free Software Foundation, Inc.
1.567 #
1.568 # This file is free software; the Free Software Foundation
1.569 # gives unlimited permission to copy and/or distribute it,
1.570 # with or without modifications, as long as this notice is preserved.
1.571
1.572 +# serial 6
1.573 +
1.574 # AM_MISSING_PROG(NAME, PROGRAM)
1.575 # ------------------------------
1.576 AC_DEFUN([AM_MISSING_PROG],
1.577 @@ -697,10 +722,11 @@
1.578 $1=${$1-"${am_missing_run}$2"}
1.579 AC_SUBST($1)])
1.580
1.581 +
1.582 # AM_MISSING_HAS_RUN
1.583 # ------------------
1.584 -# Define MISSING if not defined so far and test if it is modern enough.
1.585 -# If it is, set am_missing_run to use it, otherwise, to nothing.
1.586 +# Define MISSING if not defined so far and test if it supports --run.
1.587 +# If it does, set am_missing_run to use it, otherwise, to nothing.
1.588 AC_DEFUN([AM_MISSING_HAS_RUN],
1.589 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1.590 AC_REQUIRE_AUX_FILE([missing])dnl
1.591 @@ -713,51 +739,54 @@
1.592 esac
1.593 fi
1.594 # Use eval to expand $SHELL
1.595 -if eval "$MISSING --is-lightweight"; then
1.596 - am_missing_run="$MISSING "
1.597 +if eval "$MISSING --run true"; then
1.598 + am_missing_run="$MISSING --run "
1.599 else
1.600 am_missing_run=
1.601 - AC_MSG_WARN(['missing' script is too old or missing])
1.602 + AC_MSG_WARN([`missing' script is too old or missing])
1.603 fi
1.604 ])
1.605
1.606 -# -*- Autoconf -*-
1.607 -# Obsolete and "removed" macros, that must however still report explicit
1.608 -# error messages when used, to smooth transition.
1.609 -#
1.610 -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1.611 +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
1.612 +# Inc.
1.613 #
1.614 # This file is free software; the Free Software Foundation
1.615 # gives unlimited permission to copy and/or distribute it,
1.616 # with or without modifications, as long as this notice is preserved.
1.617
1.618 -AC_DEFUN([AM_CONFIG_HEADER],
1.619 -[AC_DIAGNOSE([obsolete],
1.620 -['$0': this macro is obsolete.
1.621 -You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
1.622 -AC_CONFIG_HEADERS($@)])
1.623 +# serial 1
1.624
1.625 -AC_DEFUN([AM_PROG_CC_STDC],
1.626 -[AC_PROG_CC
1.627 -am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
1.628 -AC_DIAGNOSE([obsolete],
1.629 -['$0': this macro is obsolete.
1.630 -You should simply use the 'AC][_PROG_CC' macro instead.
1.631 -Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
1.632 -but upon 'ac_cv_prog_cc_stdc'.])])
1.633 -
1.634 -AC_DEFUN([AM_C_PROTOTYPES],
1.635 - [AC_FATAL([automatic de-ANSI-fication support has been removed])])
1.636 -AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
1.637 +# AM_PROG_MKDIR_P
1.638 +# ---------------
1.639 +# Check for `mkdir -p'.
1.640 +AC_DEFUN([AM_PROG_MKDIR_P],
1.641 +[AC_PREREQ([2.60])dnl
1.642 +AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1.643 +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
1.644 +dnl while keeping a definition of mkdir_p for backward compatibility.
1.645 +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
1.646 +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
1.647 +dnl Makefile.ins that do not define MKDIR_P, so we do our own
1.648 +dnl adjustment using top_builddir (which is defined more often than
1.649 +dnl MKDIR_P).
1.650 +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
1.651 +case $mkdir_p in
1.652 + [[\\/$]]* | ?:[[\\/]]*) ;;
1.653 + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
1.654 +esac
1.655 +])
1.656
1.657 # Helper functions for option handling. -*- Autoconf -*-
1.658
1.659 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1.660 +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
1.661 +# Foundation, Inc.
1.662 #
1.663 # This file is free software; the Free Software Foundation
1.664 # gives unlimited permission to copy and/or distribute it,
1.665 # with or without modifications, as long as this notice is preserved.
1.666
1.667 +# serial 5
1.668 +
1.669 # _AM_MANGLE_OPTION(NAME)
1.670 # -----------------------
1.671 AC_DEFUN([_AM_MANGLE_OPTION],
1.672 @@ -767,7 +796,7 @@
1.673 # --------------------
1.674 # Set option NAME. Presently that only means defining a flag for this option.
1.675 AC_DEFUN([_AM_SET_OPTION],
1.676 -[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
1.677 +[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
1.678
1.679 # _AM_SET_OPTIONS(OPTIONS)
1.680 # ------------------------
1.681 @@ -783,16 +812,22 @@
1.682
1.683 # Check to make sure that the build environment is sane. -*- Autoconf -*-
1.684
1.685 -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1.686 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
1.687 +# Free Software Foundation, Inc.
1.688 #
1.689 # This file is free software; the Free Software Foundation
1.690 # gives unlimited permission to copy and/or distribute it,
1.691 # with or without modifications, as long as this notice is preserved.
1.692
1.693 +# serial 5
1.694 +
1.695 # AM_SANITY_CHECK
1.696 # ---------------
1.697 AC_DEFUN([AM_SANITY_CHECK],
1.698 [AC_MSG_CHECKING([whether build environment is sane])
1.699 +# Just in case
1.700 +sleep 1
1.701 +echo timestamp > conftest.file
1.702 # Reject unsafe characters in $srcdir or the absolute working directory
1.703 # name. Accept space and tab only in the latter.
1.704 am_lf='
1.705 @@ -803,40 +838,32 @@
1.706 esac
1.707 case $srcdir in
1.708 *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
1.709 - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
1.710 + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
1.711 esac
1.712
1.713 -# Do 'set' in a subshell so we don't clobber the current shell's
1.714 +# Do `set' in a subshell so we don't clobber the current shell's
1.715 # arguments. Must try -L first in case configure is actually a
1.716 # symlink; some systems play weird games with the mod time of symlinks
1.717 # (eg FreeBSD returns the mod time of the symlink's containing
1.718 # directory).
1.719 if (
1.720 - am_has_slept=no
1.721 - for am_try in 1 2; do
1.722 - echo "timestamp, slept: $am_has_slept" > conftest.file
1.723 - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
1.724 - if test "$[*]" = "X"; then
1.725 - # -L didn't work.
1.726 - set X `ls -t "$srcdir/configure" conftest.file`
1.727 - fi
1.728 - if test "$[*]" != "X $srcdir/configure conftest.file" \
1.729 - && test "$[*]" != "X conftest.file $srcdir/configure"; then
1.730 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
1.731 + if test "$[*]" = "X"; then
1.732 + # -L didn't work.
1.733 + set X `ls -t "$srcdir/configure" conftest.file`
1.734 + fi
1.735 + rm -f conftest.file
1.736 + if test "$[*]" != "X $srcdir/configure conftest.file" \
1.737 + && test "$[*]" != "X conftest.file $srcdir/configure"; then
1.738
1.739 - # If neither matched, then we have a broken ls. This can happen
1.740 - # if, for instance, CONFIG_SHELL is bash and it inherits a
1.741 - # broken ls alias from the environment. This has actually
1.742 - # happened. Such a system could not be considered "sane".
1.743 - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
1.744 - alias in your environment])
1.745 - fi
1.746 - if test "$[2]" = conftest.file || test $am_try -eq 2; then
1.747 - break
1.748 - fi
1.749 - # Just in case.
1.750 - sleep 1
1.751 - am_has_slept=yes
1.752 - done
1.753 + # If neither matched, then we have a broken ls. This can happen
1.754 + # if, for instance, CONFIG_SHELL is bash and it inherits a
1.755 + # broken ls alias from the environment. This has actually
1.756 + # happened. Such a system could not be considered "sane".
1.757 + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
1.758 +alias in your environment])
1.759 + fi
1.760 +
1.761 test "$[2]" = conftest.file
1.762 )
1.763 then
1.764 @@ -846,118 +873,46 @@
1.765 AC_MSG_ERROR([newly created file is older than distributed files!
1.766 Check your system clock])
1.767 fi
1.768 -AC_MSG_RESULT([yes])
1.769 -# If we didn't sleep, we still need to ensure time stamps of config.status and
1.770 -# generated files are strictly newer.
1.771 -am_sleep_pid=
1.772 -if grep 'slept: no' conftest.file >/dev/null 2>&1; then
1.773 - ( sleep 1 ) &
1.774 - am_sleep_pid=$!
1.775 -fi
1.776 -AC_CONFIG_COMMANDS_PRE(
1.777 - [AC_MSG_CHECKING([that generated files are newer than configure])
1.778 - if test -n "$am_sleep_pid"; then
1.779 - # Hide warnings about reused PIDs.
1.780 - wait $am_sleep_pid 2>/dev/null
1.781 - fi
1.782 - AC_MSG_RESULT([done])])
1.783 -rm -f conftest.file
1.784 -])
1.785 +AC_MSG_RESULT(yes)])
1.786
1.787 -# Copyright (C) 2009-2013 Free Software Foundation, Inc.
1.788 +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
1.789 #
1.790 # This file is free software; the Free Software Foundation
1.791 # gives unlimited permission to copy and/or distribute it,
1.792 # with or without modifications, as long as this notice is preserved.
1.793
1.794 -# AM_SILENT_RULES([DEFAULT])
1.795 -# --------------------------
1.796 -# Enable less verbose build rules; with the default set to DEFAULT
1.797 -# ("yes" being less verbose, "no" or empty being verbose).
1.798 -AC_DEFUN([AM_SILENT_RULES],
1.799 -[AC_ARG_ENABLE([silent-rules], [dnl
1.800 -AS_HELP_STRING(
1.801 - [--enable-silent-rules],
1.802 - [less verbose build output (undo: "make V=1")])
1.803 -AS_HELP_STRING(
1.804 - [--disable-silent-rules],
1.805 - [verbose build output (undo: "make V=0")])dnl
1.806 -])
1.807 -case $enable_silent_rules in @%:@ (((
1.808 - yes) AM_DEFAULT_VERBOSITY=0;;
1.809 - no) AM_DEFAULT_VERBOSITY=1;;
1.810 - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
1.811 -esac
1.812 -dnl
1.813 -dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
1.814 -dnl do not support nested variable expansions.
1.815 -dnl See automake bug#9928 and bug#10237.
1.816 -am_make=${MAKE-make}
1.817 -AC_CACHE_CHECK([whether $am_make supports nested variables],
1.818 - [am_cv_make_support_nested_variables],
1.819 - [if AS_ECHO([['TRUE=$(BAR$(V))
1.820 -BAR0=false
1.821 -BAR1=true
1.822 -V=1
1.823 -am__doit:
1.824 - @$(TRUE)
1.825 -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
1.826 - am_cv_make_support_nested_variables=yes
1.827 -else
1.828 - am_cv_make_support_nested_variables=no
1.829 -fi])
1.830 -if test $am_cv_make_support_nested_variables = yes; then
1.831 - dnl Using '$V' instead of '$(V)' breaks IRIX make.
1.832 - AM_V='$(V)'
1.833 - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
1.834 -else
1.835 - AM_V=$AM_DEFAULT_VERBOSITY
1.836 - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
1.837 -fi
1.838 -AC_SUBST([AM_V])dnl
1.839 -AM_SUBST_NOTMAKE([AM_V])dnl
1.840 -AC_SUBST([AM_DEFAULT_V])dnl
1.841 -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
1.842 -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
1.843 -AM_BACKSLASH='\'
1.844 -AC_SUBST([AM_BACKSLASH])dnl
1.845 -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1.846 -])
1.847 -
1.848 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1.849 -#
1.850 -# This file is free software; the Free Software Foundation
1.851 -# gives unlimited permission to copy and/or distribute it,
1.852 -# with or without modifications, as long as this notice is preserved.
1.853 +# serial 1
1.854
1.855 # AM_PROG_INSTALL_STRIP
1.856 # ---------------------
1.857 -# One issue with vendor 'install' (even GNU) is that you can't
1.858 +# One issue with vendor `install' (even GNU) is that you can't
1.859 # specify the program used to strip binaries. This is especially
1.860 # annoying in cross-compiling environments, where the build's strip
1.861 # is unlikely to handle the host's binaries.
1.862 # Fortunately install-sh will honor a STRIPPROG variable, so we
1.863 -# always use install-sh in "make install-strip", and initialize
1.864 +# always use install-sh in `make install-strip', and initialize
1.865 # STRIPPROG with the value of the STRIP variable (set by the user).
1.866 AC_DEFUN([AM_PROG_INSTALL_STRIP],
1.867 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1.868 -# Installed binaries are usually stripped using 'strip' when the user
1.869 -# run "make install-strip". However 'strip' might not be the right
1.870 +# Installed binaries are usually stripped using `strip' when the user
1.871 +# run `make install-strip'. However `strip' might not be the right
1.872 # tool to use in cross-compilation environments, therefore Automake
1.873 -# will honor the 'STRIP' environment variable to overrule this program.
1.874 -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
1.875 +# will honor the `STRIP' environment variable to overrule this program.
1.876 +dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
1.877 if test "$cross_compiling" != no; then
1.878 AC_CHECK_TOOL([STRIP], [strip], :)
1.879 fi
1.880 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1.881 AC_SUBST([INSTALL_STRIP_PROGRAM])])
1.882
1.883 -# Copyright (C) 2006-2013 Free Software Foundation, Inc.
1.884 +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
1.885 #
1.886 # This file is free software; the Free Software Foundation
1.887 # gives unlimited permission to copy and/or distribute it,
1.888 # with or without modifications, as long as this notice is preserved.
1.889
1.890 +# serial 3
1.891 +
1.892 # _AM_SUBST_NOTMAKE(VARIABLE)
1.893 # ---------------------------
1.894 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
1.895 @@ -971,16 +926,18 @@
1.896
1.897 # Check how to create a tarball. -*- Autoconf -*-
1.898
1.899 -# Copyright (C) 2004-2013 Free Software Foundation, Inc.
1.900 +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
1.901 #
1.902 # This file is free software; the Free Software Foundation
1.903 # gives unlimited permission to copy and/or distribute it,
1.904 # with or without modifications, as long as this notice is preserved.
1.905
1.906 +# serial 2
1.907 +
1.908 # _AM_PROG_TAR(FORMAT)
1.909 # --------------------
1.910 # Check how to create a tarball in format FORMAT.
1.911 -# FORMAT should be one of 'v7', 'ustar', or 'pax'.
1.912 +# FORMAT should be one of `v7', `ustar', or `pax'.
1.913 #
1.914 # Substitute a variable $(am__tar) that is a command
1.915 # writing to stdout a FORMAT-tarball containing the directory
1.916 @@ -990,114 +947,76 @@
1.917 # Substitute a variable $(am__untar) that extract such
1.918 # a tarball read from stdin.
1.919 # $(am__untar) < result.tar
1.920 -#
1.921 AC_DEFUN([_AM_PROG_TAR],
1.922 [# Always define AMTAR for backward compatibility. Yes, it's still used
1.923 # in the wild :-( We should find a proper way to deprecate it ...
1.924 AC_SUBST([AMTAR], ['$${TAR-tar}'])
1.925 +m4_if([$1], [v7],
1.926 + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1.927 + [m4_case([$1], [ustar],, [pax],,
1.928 + [m4_fatal([Unknown tar format])])
1.929 +AC_MSG_CHECKING([how to create a $1 tar archive])
1.930 +# Loop over all known methods to create a tar archive until one works.
1.931 +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1.932 +_am_tools=${am_cv_prog_tar_$1-$_am_tools}
1.933 +# Do not fold the above two line into one, because Tru64 sh and
1.934 +# Solaris sh will not grok spaces in the rhs of `-'.
1.935 +for _am_tool in $_am_tools
1.936 +do
1.937 + case $_am_tool in
1.938 + gnutar)
1.939 + for _am_tar in tar gnutar gtar;
1.940 + do
1.941 + AM_RUN_LOG([$_am_tar --version]) && break
1.942 + done
1.943 + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1.944 + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1.945 + am__untar="$_am_tar -xf -"
1.946 + ;;
1.947 + plaintar)
1.948 + # Must skip GNU tar: if it does not support --format= it doesn't create
1.949 + # ustar tarball either.
1.950 + (tar --version) >/dev/null 2>&1 && continue
1.951 + am__tar='tar chf - "$$tardir"'
1.952 + am__tar_='tar chf - "$tardir"'
1.953 + am__untar='tar xf -'
1.954 + ;;
1.955 + pax)
1.956 + am__tar='pax -L -x $1 -w "$$tardir"'
1.957 + am__tar_='pax -L -x $1 -w "$tardir"'
1.958 + am__untar='pax -r'
1.959 + ;;
1.960 + cpio)
1.961 + am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1.962 + am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1.963 + am__untar='cpio -i -H $1 -d'
1.964 + ;;
1.965 + none)
1.966 + am__tar=false
1.967 + am__tar_=false
1.968 + am__untar=false
1.969 + ;;
1.970 + esac
1.971
1.972 -# We'll loop over all known methods to create a tar archive until one works.
1.973 -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1.974 + # If the value was cached, stop now. We just wanted to have am__tar
1.975 + # and am__untar set.
1.976 + test -n "${am_cv_prog_tar_$1}" && break
1.977
1.978 -m4_if([$1], [v7],
1.979 - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1.980 + # tar/untar a dummy directory, and stop if the command works
1.981 + rm -rf conftest.dir
1.982 + mkdir conftest.dir
1.983 + echo GrepMe > conftest.dir/file
1.984 + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1.985 + rm -rf conftest.dir
1.986 + if test -s conftest.tar; then
1.987 + AM_RUN_LOG([$am__untar <conftest.tar])
1.988 + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1.989 + fi
1.990 +done
1.991 +rm -rf conftest.dir
1.992
1.993 - [m4_case([$1],
1.994 - [ustar],
1.995 - [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
1.996 - # There is notably a 21 bits limit for the UID and the GID. In fact,
1.997 - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
1.998 - # and bug#13588).
1.999 - am_max_uid=2097151 # 2^21 - 1
1.1000 - am_max_gid=$am_max_uid
1.1001 - # The $UID and $GID variables are not portable, so we need to resort
1.1002 - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
1.1003 - # below are definitely unexpected, so allow the users to see them
1.1004 - # (that is, avoid stderr redirection).
1.1005 - am_uid=`id -u || echo unknown`
1.1006 - am_gid=`id -g || echo unknown`
1.1007 - AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
1.1008 - if test $am_uid -le $am_max_uid; then
1.1009 - AC_MSG_RESULT([yes])
1.1010 - else
1.1011 - AC_MSG_RESULT([no])
1.1012 - _am_tools=none
1.1013 - fi
1.1014 - AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
1.1015 - if test $am_gid -le $am_max_gid; then
1.1016 - AC_MSG_RESULT([yes])
1.1017 - else
1.1018 - AC_MSG_RESULT([no])
1.1019 - _am_tools=none
1.1020 - fi],
1.1021 -
1.1022 - [pax],
1.1023 - [],
1.1024 -
1.1025 - [m4_fatal([Unknown tar format])])
1.1026 -
1.1027 - AC_MSG_CHECKING([how to create a $1 tar archive])
1.1028 -
1.1029 - # Go ahead even if we have the value already cached. We do so because we
1.1030 - # need to set the values for the 'am__tar' and 'am__untar' variables.
1.1031 - _am_tools=${am_cv_prog_tar_$1-$_am_tools}
1.1032 -
1.1033 - for _am_tool in $_am_tools; do
1.1034 - case $_am_tool in
1.1035 - gnutar)
1.1036 - for _am_tar in tar gnutar gtar; do
1.1037 - AM_RUN_LOG([$_am_tar --version]) && break
1.1038 - done
1.1039 - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1.1040 - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1.1041 - am__untar="$_am_tar -xf -"
1.1042 - ;;
1.1043 - plaintar)
1.1044 - # Must skip GNU tar: if it does not support --format= it doesn't create
1.1045 - # ustar tarball either.
1.1046 - (tar --version) >/dev/null 2>&1 && continue
1.1047 - am__tar='tar chf - "$$tardir"'
1.1048 - am__tar_='tar chf - "$tardir"'
1.1049 - am__untar='tar xf -'
1.1050 - ;;
1.1051 - pax)
1.1052 - am__tar='pax -L -x $1 -w "$$tardir"'
1.1053 - am__tar_='pax -L -x $1 -w "$tardir"'
1.1054 - am__untar='pax -r'
1.1055 - ;;
1.1056 - cpio)
1.1057 - am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1.1058 - am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1.1059 - am__untar='cpio -i -H $1 -d'
1.1060 - ;;
1.1061 - none)
1.1062 - am__tar=false
1.1063 - am__tar_=false
1.1064 - am__untar=false
1.1065 - ;;
1.1066 - esac
1.1067 -
1.1068 - # If the value was cached, stop now. We just wanted to have am__tar
1.1069 - # and am__untar set.
1.1070 - test -n "${am_cv_prog_tar_$1}" && break
1.1071 -
1.1072 - # tar/untar a dummy directory, and stop if the command works.
1.1073 - rm -rf conftest.dir
1.1074 - mkdir conftest.dir
1.1075 - echo GrepMe > conftest.dir/file
1.1076 - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1.1077 - rm -rf conftest.dir
1.1078 - if test -s conftest.tar; then
1.1079 - AM_RUN_LOG([$am__untar <conftest.tar])
1.1080 - AM_RUN_LOG([cat conftest.dir/file])
1.1081 - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1.1082 - fi
1.1083 - done
1.1084 - rm -rf conftest.dir
1.1085 -
1.1086 - AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1.1087 - AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1.1088 -
1.1089 +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1.1090 +AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1.1091 AC_SUBST([am__tar])
1.1092 AC_SUBST([am__untar])
1.1093 ]) # _AM_PROG_TAR
2.1 --- a/autom4te.cache/output.0 Fri Mar 28 16:21:31 2014 +0000
2.2 +++ b/autom4te.cache/output.0 Sat Mar 29 13:10:05 2014 +0000
2.3 @@ -1,11 +1,13 @@
2.4 @%:@! /bin/sh
2.5 @%:@ Guess values for system-dependent variables and create Makefiles.
2.6 -@%:@ Generated by GNU Autoconf 2.69 for ltplib 0.1.
2.7 +@%:@ Generated by GNU Autoconf 2.68 for ltplib 0.1.
2.8 @%:@
2.9 @%:@ Report bugs to <EMAIL PROTECTED>.
2.10 @%:@
2.11 @%:@
2.12 -@%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
2.13 +@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2.14 +@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
2.15 +@%:@ Foundation, Inc.
2.16 @%:@
2.17 @%:@
2.18 @%:@ This configure script is free software; the Free Software Foundation
2.19 @@ -134,31 +136,6 @@
2.20 # CDPATH.
2.21 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2.22
2.23 -# Use a proper internal environment variable to ensure we don't fall
2.24 - # into an infinite loop, continuously re-executing ourselves.
2.25 - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
2.26 - _as_can_reexec=no; export _as_can_reexec;
2.27 - # We cannot yet assume a decent shell, so we have to provide a
2.28 -# neutralization value for shells without unset; and this also
2.29 -# works around shells that cannot unset nonexistent variables.
2.30 -# Preserve -v and -x to the replacement shell.
2.31 -BASH_ENV=/dev/null
2.32 -ENV=/dev/null
2.33 -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
2.34 -case $- in @%:@ ((((
2.35 - *v*x* | *x*v* ) as_opts=-vx ;;
2.36 - *v* ) as_opts=-v ;;
2.37 - *x* ) as_opts=-x ;;
2.38 - * ) as_opts= ;;
2.39 -esac
2.40 -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
2.41 -# Admittedly, this is quite paranoid, since all the known shells bail
2.42 -# out after a failed `exec'.
2.43 -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
2.44 -as_fn_exit 255
2.45 - fi
2.46 - # We don't want this to propagate to other subprocesses.
2.47 - { _as_can_reexec=; unset _as_can_reexec;}
2.48 if test "x$CONFIG_SHELL" = x; then
2.49 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
2.50 emulate sh
2.51 @@ -192,8 +169,7 @@
2.52 else
2.53 exitcode=1; echo positional parameters were not saved.
2.54 fi
2.55 -test x\$exitcode = x0 || exit 1
2.56 -test -x / || exit 1"
2.57 +test x\$exitcode = x0 || exit 1"
2.58 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
2.59 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
2.60 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
2.61 @@ -237,25 +213,21 @@
2.62
2.63
2.64 if test "x$CONFIG_SHELL" != x; then :
2.65 - export CONFIG_SHELL
2.66 - # We cannot yet assume a decent shell, so we have to provide a
2.67 -# neutralization value for shells without unset; and this also
2.68 -# works around shells that cannot unset nonexistent variables.
2.69 -# Preserve -v and -x to the replacement shell.
2.70 -BASH_ENV=/dev/null
2.71 -ENV=/dev/null
2.72 -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
2.73 -case $- in @%:@ ((((
2.74 - *v*x* | *x*v* ) as_opts=-vx ;;
2.75 - *v* ) as_opts=-v ;;
2.76 - *x* ) as_opts=-x ;;
2.77 - * ) as_opts= ;;
2.78 -esac
2.79 -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
2.80 -# Admittedly, this is quite paranoid, since all the known shells bail
2.81 -# out after a failed `exec'.
2.82 -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
2.83 -exit 255
2.84 + # We cannot yet assume a decent shell, so we have to provide a
2.85 + # neutralization value for shells without unset; and this also
2.86 + # works around shells that cannot unset nonexistent variables.
2.87 + # Preserve -v and -x to the replacement shell.
2.88 + BASH_ENV=/dev/null
2.89 + ENV=/dev/null
2.90 + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
2.91 + export CONFIG_SHELL
2.92 + case $- in @%:@ ((((
2.93 + *v*x* | *x*v* ) as_opts=-vx ;;
2.94 + *v* ) as_opts=-v ;;
2.95 + *x* ) as_opts=-x ;;
2.96 + * ) as_opts= ;;
2.97 + esac
2.98 + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
2.99 fi
2.100
2.101 if test x$as_have_required = xno; then :
2.102 @@ -358,14 +330,6 @@
2.103
2.104
2.105 } @%:@ as_fn_mkdir_p
2.106 -
2.107 -@%:@ as_fn_executable_p FILE
2.108 -@%:@ -----------------------
2.109 -@%:@ Test if FILE is an executable regular file.
2.110 -as_fn_executable_p ()
2.111 -{
2.112 - test -f "$1" && test -x "$1"
2.113 -} @%:@ as_fn_executable_p
2.114 @%:@ as_fn_append VAR VALUE
2.115 @%:@ ----------------------
2.116 @%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
2.117 @@ -487,10 +451,6 @@
2.118 chmod +x "$as_me.lineno" ||
2.119 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
2.120
2.121 - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
2.122 - # already done that, so ensure we don't try to do so again and fall
2.123 - # in an infinite loop. This has already happened in practice.
2.124 - _as_can_reexec=no; export _as_can_reexec
2.125 # Don't try to exec as it changes $[0], causing all sort of problems
2.126 # (the dirname of $[0] is not the place where we might find the
2.127 # original and so on. Autoconf is especially sensitive to this).
2.128 @@ -525,16 +485,16 @@
2.129 # ... but there are two gotchas:
2.130 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
2.131 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
2.132 - # In both cases, we have to default to `cp -pR'.
2.133 + # In both cases, we have to default to `cp -p'.
2.134 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
2.135 - as_ln_s='cp -pR'
2.136 + as_ln_s='cp -p'
2.137 elif ln conf$$.file conf$$ 2>/dev/null; then
2.138 as_ln_s=ln
2.139 else
2.140 - as_ln_s='cp -pR'
2.141 + as_ln_s='cp -p'
2.142 fi
2.143 else
2.144 - as_ln_s='cp -pR'
2.145 + as_ln_s='cp -p'
2.146 fi
2.147 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
2.148 rmdir conf$$.dir 2>/dev/null
2.149 @@ -546,8 +506,28 @@
2.150 as_mkdir_p=false
2.151 fi
2.152
2.153 -as_test_x='test -x'
2.154 -as_executable_p=as_fn_executable_p
2.155 +if test -x / >/dev/null 2>&1; then
2.156 + as_test_x='test -x'
2.157 +else
2.158 + if ls -dL / >/dev/null 2>&1; then
2.159 + as_ls_L_option=L
2.160 + else
2.161 + as_ls_L_option=
2.162 + fi
2.163 + as_test_x='
2.164 + eval sh -c '\''
2.165 + if test -d "$1"; then
2.166 + test -d "$1/.";
2.167 + else
2.168 + case $1 in @%:@(
2.169 + -*)set "./$1";;
2.170 + esac;
2.171 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
2.172 + ???[sx]*):;;*)false;;esac;fi
2.173 + '\'' sh
2.174 + '
2.175 +fi
2.176 +as_executable_p=$as_test_x
2.177
2.178 # Sed expression to map a string onto a valid CPP name.
2.179 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
2.180 @@ -625,10 +605,6 @@
2.181 LDFLAGS
2.182 CFLAGS
2.183 CC
2.184 -AM_BACKSLASH
2.185 -AM_DEFAULT_VERBOSITY
2.186 -AM_DEFAULT_V
2.187 -AM_V
2.188 am__untar
2.189 am__tar
2.190 AMTAR
2.191 @@ -693,7 +669,6 @@
2.192 ac_subst_files=''
2.193 ac_user_opts='
2.194 enable_option_checking
2.195 -enable_silent_rules
2.196 enable_dependency_tracking
2.197 enable_maintainer_mode
2.198 '
2.199 @@ -1163,6 +1138,8 @@
2.200 if test "x$host_alias" != x; then
2.201 if test "x$build_alias" = x; then
2.202 cross_compiling=maybe
2.203 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
2.204 + If a cross compiler is detected then cross compile mode will be used" >&2
2.205 elif test "x$build_alias" != "x$host_alias"; then
2.206 cross_compiling=yes
2.207 fi
2.208 @@ -1326,15 +1303,10 @@
2.209 --disable-option-checking ignore unrecognized --enable/--with options
2.210 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
2.211 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
2.212 - --enable-silent-rules less verbose build output (undo: "make V=1")
2.213 - --disable-silent-rules verbose build output (undo: "make V=0")
2.214 - --enable-dependency-tracking
2.215 - do not reject slow dependency extractors
2.216 - --disable-dependency-tracking
2.217 - speeds up one-time build
2.218 - --enable-maintainer-mode
2.219 - enable make rules and dependencies not useful (and
2.220 - sometimes confusing) to the casual installer
2.221 + --disable-dependency-tracking speeds up one-time build
2.222 + --enable-dependency-tracking do not reject slow dependency extractors
2.223 + --enable-maintainer-mode enable make rules and dependencies not useful
2.224 + (and sometimes confusing) to the casual installer
2.225
2.226 Some influential environment variables:
2.227 CC C compiler command
2.228 @@ -1414,9 +1386,9 @@
2.229 if $ac_init_version; then
2.230 cat <<\_ACEOF
2.231 ltplib configure 0.1
2.232 -generated by GNU Autoconf 2.69
2.233 -
2.234 -Copyright (C) 2012 Free Software Foundation, Inc.
2.235 +generated by GNU Autoconf 2.68
2.236 +
2.237 +Copyright (C) 2010 Free Software Foundation, Inc.
2.238 This configure script is free software; the Free Software Foundation
2.239 gives unlimited permission to copy, distribute and modify it.
2.240 _ACEOF
2.241 @@ -1507,7 +1479,7 @@
2.242 running configure, to aid debugging if configure makes a mistake.
2.243
2.244 It was created by ltplib $as_me 0.1, which was
2.245 -generated by GNU Autoconf 2.69. Invocation command line was
2.246 +generated by GNU Autoconf 2.68. Invocation command line was
2.247
2.248 $ $0 $@
2.249
2.250 @@ -1856,7 +1828,7 @@
2.251
2.252 ac_config_headers="$ac_config_headers config.h"
2.253
2.254 -am__api_version='1.13'
2.255 +am__api_version='1.11'
2.256
2.257 ac_aux_dir=
2.258 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
2.259 @@ -1924,7 +1896,7 @@
2.260 # by default.
2.261 for ac_prog in ginstall scoinst install; do
2.262 for ac_exec_ext in '' $ac_executable_extensions; do
2.263 - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2.264 + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
2.265 if test $ac_prog = install &&
2.266 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2.267 # AIX install. It has an incompatible calling convention.
2.268 @@ -1982,6 +1954,9 @@
2.269
2.270 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2.271 $as_echo_n "checking whether build environment is sane... " >&6; }
2.272 +# Just in case
2.273 +sleep 1
2.274 +echo timestamp > conftest.file
2.275 # Reject unsafe characters in $srcdir or the absolute working directory
2.276 # name. Accept space and tab only in the latter.
2.277 am_lf='
2.278 @@ -1992,40 +1967,32 @@
2.279 esac
2.280 case $srcdir in
2.281 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2.282 - as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
2.283 + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2.284 esac
2.285
2.286 -# Do 'set' in a subshell so we don't clobber the current shell's
2.287 +# Do `set' in a subshell so we don't clobber the current shell's
2.288 # arguments. Must try -L first in case configure is actually a
2.289 # symlink; some systems play weird games with the mod time of symlinks
2.290 # (eg FreeBSD returns the mod time of the symlink's containing
2.291 # directory).
2.292 if (
2.293 - am_has_slept=no
2.294 - for am_try in 1 2; do
2.295 - echo "timestamp, slept: $am_has_slept" > conftest.file
2.296 - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2.297 - if test "$*" = "X"; then
2.298 - # -L didn't work.
2.299 - set X `ls -t "$srcdir/configure" conftest.file`
2.300 - fi
2.301 - if test "$*" != "X $srcdir/configure conftest.file" \
2.302 - && test "$*" != "X conftest.file $srcdir/configure"; then
2.303 -
2.304 - # If neither matched, then we have a broken ls. This can happen
2.305 - # if, for instance, CONFIG_SHELL is bash and it inherits a
2.306 - # broken ls alias from the environment. This has actually
2.307 - # happened. Such a system could not be considered "sane".
2.308 - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
2.309 - alias in your environment" "$LINENO" 5
2.310 - fi
2.311 - if test "$2" = conftest.file || test $am_try -eq 2; then
2.312 - break
2.313 - fi
2.314 - # Just in case.
2.315 - sleep 1
2.316 - am_has_slept=yes
2.317 - done
2.318 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2.319 + if test "$*" = "X"; then
2.320 + # -L didn't work.
2.321 + set X `ls -t "$srcdir/configure" conftest.file`
2.322 + fi
2.323 + rm -f conftest.file
2.324 + if test "$*" != "X $srcdir/configure conftest.file" \
2.325 + && test "$*" != "X conftest.file $srcdir/configure"; then
2.326 +
2.327 + # If neither matched, then we have a broken ls. This can happen
2.328 + # if, for instance, CONFIG_SHELL is bash and it inherits a
2.329 + # broken ls alias from the environment. This has actually
2.330 + # happened. Such a system could not be considered "sane".
2.331 + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
2.332 +alias in your environment" "$LINENO" 5
2.333 + fi
2.334 +
2.335 test "$2" = conftest.file
2.336 )
2.337 then
2.338 @@ -2037,16 +2004,6 @@
2.339 fi
2.340 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2.341 $as_echo "yes" >&6; }
2.342 -# If we didn't sleep, we still need to ensure time stamps of config.status and
2.343 -# generated files are strictly newer.
2.344 -am_sleep_pid=
2.345 -if grep 'slept: no' conftest.file >/dev/null 2>&1; then
2.346 - ( sleep 1 ) &
2.347 - am_sleep_pid=$!
2.348 -fi
2.349 -
2.350 -rm -f conftest.file
2.351 -
2.352 test "$program_prefix" != NONE &&
2.353 program_transform_name="s&^&$program_prefix&;$program_transform_name"
2.354 # Use a double $ so make ignores it.
2.355 @@ -2069,12 +2026,12 @@
2.356 esac
2.357 fi
2.358 # Use eval to expand $SHELL
2.359 -if eval "$MISSING --is-lightweight"; then
2.360 - am_missing_run="$MISSING "
2.361 +if eval "$MISSING --run true"; then
2.362 + am_missing_run="$MISSING --run "
2.363 else
2.364 am_missing_run=
2.365 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
2.366 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
2.367 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
2.368 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
2.369 fi
2.370
2.371 if test x"${install_sh}" != xset; then
2.372 @@ -2086,10 +2043,10 @@
2.373 esac
2.374 fi
2.375
2.376 -# Installed binaries are usually stripped using 'strip' when the user
2.377 -# run "make install-strip". However 'strip' might not be the right
2.378 +# Installed binaries are usually stripped using `strip' when the user
2.379 +# run `make install-strip'. However `strip' might not be the right
2.380 # tool to use in cross-compilation environments, therefore Automake
2.381 -# will honor the 'STRIP' environment variable to overrule this program.
2.382 +# will honor the `STRIP' environment variable to overrule this program.
2.383 if test "$cross_compiling" != no; then
2.384 if test -n "$ac_tool_prefix"; then
2.385 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2.386 @@ -2108,7 +2065,7 @@
2.387 IFS=$as_save_IFS
2.388 test -z "$as_dir" && as_dir=.
2.389 for ac_exec_ext in '' $ac_executable_extensions; do
2.390 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.391 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.392 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2.393 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2.394 break 2
2.395 @@ -2148,7 +2105,7 @@
2.396 IFS=$as_save_IFS
2.397 test -z "$as_dir" && as_dir=.
2.398 for ac_exec_ext in '' $ac_executable_extensions; do
2.399 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.400 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.401 ac_cv_prog_ac_ct_STRIP="strip"
2.402 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2.403 break 2
2.404 @@ -2199,7 +2156,7 @@
2.405 test -z "$as_dir" && as_dir=.
2.406 for ac_prog in mkdir gmkdir; do
2.407 for ac_exec_ext in '' $ac_executable_extensions; do
2.408 - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
2.409 + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
2.410 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
2.411 'mkdir (GNU coreutils) '* | \
2.412 'mkdir (coreutils) '* | \
2.413 @@ -2228,6 +2185,12 @@
2.414 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
2.415 $as_echo "$MKDIR_P" >&6; }
2.416
2.417 +mkdir_p="$MKDIR_P"
2.418 +case $mkdir_p in
2.419 + [\\/$]* | ?:[\\/]*) ;;
2.420 + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
2.421 +esac
2.422 +
2.423 for ac_prog in gawk mawk nawk awk
2.424 do
2.425 # Extract the first word of "$ac_prog", so it can be a program name with args.
2.426 @@ -2246,7 +2209,7 @@
2.427 IFS=$as_save_IFS
2.428 test -z "$as_dir" && as_dir=.
2.429 for ac_exec_ext in '' $ac_executable_extensions; do
2.430 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.431 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.432 ac_cv_prog_AWK="$ac_prog"
2.433 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2.434 break 2
2.435 @@ -2310,45 +2273,6 @@
2.436 fi
2.437 rmdir .tst 2>/dev/null
2.438
2.439 -@%:@ Check whether --enable-silent-rules was given.
2.440 -if test "${enable_silent_rules+set}" = set; then :
2.441 - enableval=$enable_silent_rules;
2.442 -fi
2.443 -
2.444 -case $enable_silent_rules in @%:@ (((
2.445 - yes) AM_DEFAULT_VERBOSITY=0;;
2.446 - no) AM_DEFAULT_VERBOSITY=1;;
2.447 - *) AM_DEFAULT_VERBOSITY=1;;
2.448 -esac
2.449 -am_make=${MAKE-make}
2.450 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
2.451 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
2.452 -if ${am_cv_make_support_nested_variables+:} false; then :
2.453 - $as_echo_n "(cached) " >&6
2.454 -else
2.455 - if $as_echo 'TRUE=$(BAR$(V))
2.456 -BAR0=false
2.457 -BAR1=true
2.458 -V=1
2.459 -am__doit:
2.460 - @$(TRUE)
2.461 -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
2.462 - am_cv_make_support_nested_variables=yes
2.463 -else
2.464 - am_cv_make_support_nested_variables=no
2.465 -fi
2.466 -fi
2.467 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
2.468 -$as_echo "$am_cv_make_support_nested_variables" >&6; }
2.469 -if test $am_cv_make_support_nested_variables = yes; then
2.470 - AM_V='$(V)'
2.471 - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
2.472 -else
2.473 - AM_V=$AM_DEFAULT_VERBOSITY
2.474 - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
2.475 -fi
2.476 -AM_BACKSLASH='\'
2.477 -
2.478 if test "`cd $srcdir && pwd`" != "`pwd`"; then
2.479 # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
2.480 # is not polluted with repeated "-I."
2.481 @@ -2399,28 +2323,17 @@
2.482
2.483 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
2.484
2.485 -# For better backward compatibility. To be removed once Automake 1.9.x
2.486 -# dies out for good. For more background, see:
2.487 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
2.488 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
2.489 -mkdir_p='$(MKDIR_P)'
2.490 -
2.491 # We need awk for the "check" target. The system "awk" is bad on
2.492 # some platforms.
2.493 # Always define AMTAR for backward compatibility. Yes, it's still used
2.494 # in the wild :-( We should find a proper way to deprecate it ...
2.495 AMTAR='$${TAR-tar}'
2.496
2.497 -
2.498 -# We'll loop over all known methods to create a tar archive until one works.
2.499 -_am_tools='gnutar pax cpio none'
2.500 -
2.501 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
2.502
2.503
2.504
2.505
2.506 -
2.507
2.508
2.509 ac_ext=c
2.510 @@ -2445,7 +2358,7 @@
2.511 IFS=$as_save_IFS
2.512 test -z "$as_dir" && as_dir=.
2.513 for ac_exec_ext in '' $ac_executable_extensions; do
2.514 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.515 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.516 ac_cv_prog_CC="${ac_tool_prefix}gcc"
2.517 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2.518 break 2
2.519 @@ -2485,7 +2398,7 @@
2.520 IFS=$as_save_IFS
2.521 test -z "$as_dir" && as_dir=.
2.522 for ac_exec_ext in '' $ac_executable_extensions; do
2.523 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.524 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.525 ac_cv_prog_ac_ct_CC="gcc"
2.526 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2.527 break 2
2.528 @@ -2538,7 +2451,7 @@
2.529 IFS=$as_save_IFS
2.530 test -z "$as_dir" && as_dir=.
2.531 for ac_exec_ext in '' $ac_executable_extensions; do
2.532 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.533 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.534 ac_cv_prog_CC="${ac_tool_prefix}cc"
2.535 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2.536 break 2
2.537 @@ -2579,7 +2492,7 @@
2.538 IFS=$as_save_IFS
2.539 test -z "$as_dir" && as_dir=.
2.540 for ac_exec_ext in '' $ac_executable_extensions; do
2.541 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.542 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.543 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
2.544 ac_prog_rejected=yes
2.545 continue
2.546 @@ -2637,7 +2550,7 @@
2.547 IFS=$as_save_IFS
2.548 test -z "$as_dir" && as_dir=.
2.549 for ac_exec_ext in '' $ac_executable_extensions; do
2.550 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.551 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.552 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
2.553 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2.554 break 2
2.555 @@ -2681,7 +2594,7 @@
2.556 IFS=$as_save_IFS
2.557 test -z "$as_dir" && as_dir=.
2.558 for ac_exec_ext in '' $ac_executable_extensions; do
2.559 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.560 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.561 ac_cv_prog_ac_ct_CC="$ac_prog"
2.562 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2.563 break 2
2.564 @@ -3127,7 +3040,8 @@
2.565 /* end confdefs.h. */
2.566 #include <stdarg.h>
2.567 #include <stdio.h>
2.568 -struct stat;
2.569 +#include <sys/types.h>
2.570 +#include <sys/stat.h>
2.571 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
2.572 struct buf { int x; };
2.573 FILE * (*rcsopen) (struct buf *, struct stat *, int);
2.574 @@ -3230,7 +3144,7 @@
2.575 _am_result=none
2.576 # First try GNU make style include.
2.577 echo "include confinc" > confmf
2.578 -# Ignore all kinds of additional output from 'make'.
2.579 +# Ignore all kinds of additional output from `make'.
2.580 case `$am_make -s -f confmf 2> /dev/null` in #(
2.581 *the\ am__doit\ target*)
2.582 am__include=include
2.583 @@ -3286,8 +3200,8 @@
2.584 # We make a subdir and do the tests there. Otherwise we can end up
2.585 # making bogus files that we don't know about and never remove. For
2.586 # instance it was reported that on HP-UX the gcc test will end up
2.587 - # making a dummy file named 'D' -- because '-MD' means "put the output
2.588 - # in D".
2.589 + # making a dummy file named `D' -- because `-MD' means `put the output
2.590 + # in D'.
2.591 rm -rf conftest.dir
2.592 mkdir conftest.dir
2.593 # Copy depcomp to subdir because otherwise we won't find it if we're
2.594 @@ -3322,16 +3236,16 @@
2.595 : > sub/conftest.c
2.596 for i in 1 2 3 4 5 6; do
2.597 echo '#include "conftst'$i'.h"' >> sub/conftest.c
2.598 - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
2.599 - # Solaris 10 /bin/sh.
2.600 - echo '/* dummy */' > sub/conftst$i.h
2.601 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
2.602 + # Solaris 8's {/usr,}/bin/sh.
2.603 + touch sub/conftst$i.h
2.604 done
2.605 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
2.606
2.607 - # We check with '-c' and '-o' for the sake of the "dashmstdout"
2.608 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
2.609 # mode. It turns out that the SunPro C++ compiler does not properly
2.610 - # handle '-M -o', and we need to detect this. Also, some Intel
2.611 - # versions had trouble with output in subdirs.
2.612 + # handle `-M -o', and we need to detect this. Also, some Intel
2.613 + # versions had trouble with output in subdirs
2.614 am__obj=sub/conftest.${OBJEXT-o}
2.615 am__minus_obj="-o $am__obj"
2.616 case $depmode in
2.617 @@ -3340,8 +3254,8 @@
2.618 test "$am__universal" = false || continue
2.619 ;;
2.620 nosideeffect)
2.621 - # After this tag, mechanisms are not by side-effect, so they'll
2.622 - # only be used when explicitly requested.
2.623 + # after this tag, mechanisms are not by side-effect, so they'll
2.624 + # only be used when explicitly requested
2.625 if test "x$enable_dependency_tracking" = xyes; then
2.626 continue
2.627 else
2.628 @@ -3349,7 +3263,7 @@
2.629 fi
2.630 ;;
2.631 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
2.632 - # This compiler won't grok '-c -o', but also, the minuso test has
2.633 + # This compiler won't grok `-c -o', but also, the minuso test has
2.634 # not run yet. These depmodes are late enough in the game, and
2.635 # so weak that their functioning should not be impacted.
2.636 am__obj=conftest.${OBJEXT-o}
2.637 @@ -3431,7 +3345,7 @@
2.638 IFS=$as_save_IFS
2.639 test -z "$as_dir" && as_dir=.
2.640 for ac_exec_ext in '' $ac_executable_extensions; do
2.641 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.642 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.643 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
2.644 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2.645 break 2
2.646 @@ -3475,7 +3389,7 @@
2.647 IFS=$as_save_IFS
2.648 test -z "$as_dir" && as_dir=.
2.649 for ac_exec_ext in '' $ac_executable_extensions; do
2.650 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.651 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.652 ac_cv_prog_ac_ct_CXX="$ac_prog"
2.653 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2.654 break 2
2.655 @@ -3671,8 +3585,8 @@
2.656 # We make a subdir and do the tests there. Otherwise we can end up
2.657 # making bogus files that we don't know about and never remove. For
2.658 # instance it was reported that on HP-UX the gcc test will end up
2.659 - # making a dummy file named 'D' -- because '-MD' means "put the output
2.660 - # in D".
2.661 + # making a dummy file named `D' -- because `-MD' means `put the output
2.662 + # in D'.
2.663 rm -rf conftest.dir
2.664 mkdir conftest.dir
2.665 # Copy depcomp to subdir because otherwise we won't find it if we're
2.666 @@ -3707,16 +3621,16 @@
2.667 : > sub/conftest.c
2.668 for i in 1 2 3 4 5 6; do
2.669 echo '#include "conftst'$i'.h"' >> sub/conftest.c
2.670 - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
2.671 - # Solaris 10 /bin/sh.
2.672 - echo '/* dummy */' > sub/conftst$i.h
2.673 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
2.674 + # Solaris 8's {/usr,}/bin/sh.
2.675 + touch sub/conftst$i.h
2.676 done
2.677 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
2.678
2.679 - # We check with '-c' and '-o' for the sake of the "dashmstdout"
2.680 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
2.681 # mode. It turns out that the SunPro C++ compiler does not properly
2.682 - # handle '-M -o', and we need to detect this. Also, some Intel
2.683 - # versions had trouble with output in subdirs.
2.684 + # handle `-M -o', and we need to detect this. Also, some Intel
2.685 + # versions had trouble with output in subdirs
2.686 am__obj=sub/conftest.${OBJEXT-o}
2.687 am__minus_obj="-o $am__obj"
2.688 case $depmode in
2.689 @@ -3725,8 +3639,8 @@
2.690 test "$am__universal" = false || continue
2.691 ;;
2.692 nosideeffect)
2.693 - # After this tag, mechanisms are not by side-effect, so they'll
2.694 - # only be used when explicitly requested.
2.695 + # after this tag, mechanisms are not by side-effect, so they'll
2.696 + # only be used when explicitly requested
2.697 if test "x$enable_dependency_tracking" = xyes; then
2.698 continue
2.699 else
2.700 @@ -3734,7 +3648,7 @@
2.701 fi
2.702 ;;
2.703 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
2.704 - # This compiler won't grok '-c -o', but also, the minuso test has
2.705 + # This compiler won't grok `-c -o', but also, the minuso test has
2.706 # not run yet. These depmodes are late enough in the game, and
2.707 # so weak that their functioning should not be impacted.
2.708 am__obj=conftest.${OBJEXT-o}
2.709 @@ -3805,7 +3719,7 @@
2.710 IFS=$as_save_IFS
2.711 test -z "$as_dir" && as_dir=.
2.712 for ac_exec_ext in '' $ac_executable_extensions; do
2.713 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.714 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.715 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
2.716 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2.717 break 2
2.718 @@ -3845,7 +3759,7 @@
2.719 IFS=$as_save_IFS
2.720 test -z "$as_dir" && as_dir=.
2.721 for ac_exec_ext in '' $ac_executable_extensions; do
2.722 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2.723 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.724 ac_cv_prog_ac_ct_RANLIB="ranlib"
2.725 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2.726 break 2
2.727 @@ -4188,6 +4102,7 @@
2.728
2.729 ac_libobjs=
2.730 ac_ltlibobjs=
2.731 +U=
2.732 for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
2.733 # 1. Remove the extension, and $U if already installed.
2.734 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
2.735 @@ -4202,14 +4117,6 @@
2.736 LTLIBOBJS=$ac_ltlibobjs
2.737
2.738
2.739 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
2.740 -$as_echo_n "checking that generated files are newer than configure... " >&6; }
2.741 - if test -n "$am_sleep_pid"; then
2.742 - # Hide warnings about reused PIDs.
2.743 - wait $am_sleep_pid 2>/dev/null
2.744 - fi
2.745 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
2.746 -$as_echo "done" >&6; }
2.747 if test -n "$EXEEXT"; then
2.748 am__EXEEXT_TRUE=
2.749 am__EXEEXT_FALSE='#'
2.750 @@ -4540,16 +4447,16 @@
2.751 # ... but there are two gotchas:
2.752 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
2.753 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
2.754 - # In both cases, we have to default to `cp -pR'.
2.755 + # In both cases, we have to default to `cp -p'.
2.756 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
2.757 - as_ln_s='cp -pR'
2.758 + as_ln_s='cp -p'
2.759 elif ln conf$$.file conf$$ 2>/dev/null; then
2.760 as_ln_s=ln
2.761 else
2.762 - as_ln_s='cp -pR'
2.763 + as_ln_s='cp -p'
2.764 fi
2.765 else
2.766 - as_ln_s='cp -pR'
2.767 + as_ln_s='cp -p'
2.768 fi
2.769 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
2.770 rmdir conf$$.dir 2>/dev/null
2.771 @@ -4609,16 +4516,28 @@
2.772 as_mkdir_p=false
2.773 fi
2.774
2.775 -
2.776 -@%:@ as_fn_executable_p FILE
2.777 -@%:@ -----------------------
2.778 -@%:@ Test if FILE is an executable regular file.
2.779 -as_fn_executable_p ()
2.780 -{
2.781 - test -f "$1" && test -x "$1"
2.782 -} @%:@ as_fn_executable_p
2.783 -as_test_x='test -x'
2.784 -as_executable_p=as_fn_executable_p
2.785 +if test -x / >/dev/null 2>&1; then
2.786 + as_test_x='test -x'
2.787 +else
2.788 + if ls -dL / >/dev/null 2>&1; then
2.789 + as_ls_L_option=L
2.790 + else
2.791 + as_ls_L_option=
2.792 + fi
2.793 + as_test_x='
2.794 + eval sh -c '\''
2.795 + if test -d "$1"; then
2.796 + test -d "$1/.";
2.797 + else
2.798 + case $1 in @%:@(
2.799 + -*)set "./$1";;
2.800 + esac;
2.801 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
2.802 + ???[sx]*):;;*)false;;esac;fi
2.803 + '\'' sh
2.804 + '
2.805 +fi
2.806 +as_executable_p=$as_test_x
2.807
2.808 # Sed expression to map a string onto a valid CPP name.
2.809 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
2.810 @@ -4640,7 +4559,7 @@
2.811 # values after options handling.
2.812 ac_log="
2.813 This file was extended by ltplib $as_me 0.1, which was
2.814 -generated by GNU Autoconf 2.69. Invocation command line was
2.815 +generated by GNU Autoconf 2.68. Invocation command line was
2.816
2.817 CONFIG_FILES = $CONFIG_FILES
2.818 CONFIG_HEADERS = $CONFIG_HEADERS
2.819 @@ -4706,10 +4625,10 @@
2.820 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
2.821 ac_cs_version="\\
2.822 ltplib config.status 0.1
2.823 -configured by $0, generated by GNU Autoconf 2.69,
2.824 +configured by $0, generated by GNU Autoconf 2.68,
2.825 with options \\"\$ac_cs_config\\"
2.826
2.827 -Copyright (C) 2012 Free Software Foundation, Inc.
2.828 +Copyright (C) 2010 Free Software Foundation, Inc.
2.829 This config.status script is free software; the Free Software Foundation
2.830 gives unlimited permission to copy, distribute and modify it."
2.831
2.832 @@ -4800,7 +4719,7 @@
2.833 _ACEOF
2.834 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2.835 if \$ac_cs_recheck; then
2.836 - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
2.837 + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
2.838 shift
2.839 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
2.840 CONFIG_SHELL='$SHELL'
2.841 @@ -5437,7 +5356,7 @@
2.842
2.843 case $ac_file$ac_mode in
2.844 "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
2.845 - # Older Autoconf quotes --file arguments for eval, but not when files
2.846 + # Autoconf 2.62 quotes --file arguments for eval, but not when files
2.847 # are listed without --file. Let's play safe and only enable the eval
2.848 # if we detect the quoting.
2.849 case $CONFIG_FILES in
2.850 @@ -5450,7 +5369,7 @@
2.851 # Strip MF so we end up with the name of the file.
2.852 mf=`echo "$mf" | sed -e 's/:.*$//'`
2.853 # Check whether this is an Automake generated Makefile or not.
2.854 - # We used to match only the files named 'Makefile.in', but
2.855 + # We used to match only the files named `Makefile.in', but
2.856 # some people rename them; so instead we look at the file content.
2.857 # Grep'ing the first line is not enough: some people post-process
2.858 # each Makefile.in and add a new line on top of each file to say so.
2.859 @@ -5484,19 +5403,21 @@
2.860 continue
2.861 fi
2.862 # Extract the definition of DEPDIR, am__include, and am__quote
2.863 - # from the Makefile without running 'make'.
2.864 + # from the Makefile without running `make'.
2.865 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
2.866 test -z "$DEPDIR" && continue
2.867 am__include=`sed -n 's/^am__include = //p' < "$mf"`
2.868 - test -z "$am__include" && continue
2.869 + test -z "am__include" && continue
2.870 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
2.871 + # When using ansi2knr, U may be empty or an underscore; expand it
2.872 + U=`sed -n 's/^U = //p' < "$mf"`
2.873 # Find all dependency output files, they are included files with
2.874 # $(DEPDIR) in their names. We invoke sed twice because it is the
2.875 # simplest approach to changing $(DEPDIR) to its actual value in the
2.876 # expansion.
2.877 for file in `sed -n "
2.878 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
2.879 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
2.880 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
2.881 # Make sure the directory exists.
2.882 test -f "$dirpart/$file" && continue
2.883 fdir=`$as_dirname -- "$file" ||
3.1 --- a/autom4te.cache/output.1 Fri Mar 28 16:21:31 2014 +0000
3.2 +++ b/autom4te.cache/output.1 Sat Mar 29 13:10:05 2014 +0000
3.3 @@ -1,11 +1,13 @@
3.4 @%:@! /bin/sh
3.5 @%:@ Guess values for system-dependent variables and create Makefiles.
3.6 -@%:@ Generated by GNU Autoconf 2.69 for ltplib 0.1.
3.7 +@%:@ Generated by GNU Autoconf 2.68 for ltplib 0.1.
3.8 @%:@
3.9 @%:@ Report bugs to <EMAIL PROTECTED>.
3.10 @%:@
3.11 @%:@
3.12 -@%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
3.13 +@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
3.14 +@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
3.15 +@%:@ Foundation, Inc.
3.16 @%:@
3.17 @%:@
3.18 @%:@ This configure script is free software; the Free Software Foundation
3.19 @@ -134,31 +136,6 @@
3.20 # CDPATH.
3.21 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
3.22
3.23 -# Use a proper internal environment variable to ensure we don't fall
3.24 - # into an infinite loop, continuously re-executing ourselves.
3.25 - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
3.26 - _as_can_reexec=no; export _as_can_reexec;
3.27 - # We cannot yet assume a decent shell, so we have to provide a
3.28 -# neutralization value for shells without unset; and this also
3.29 -# works around shells that cannot unset nonexistent variables.
3.30 -# Preserve -v and -x to the replacement shell.
3.31 -BASH_ENV=/dev/null
3.32 -ENV=/dev/null
3.33 -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
3.34 -case $- in @%:@ ((((
3.35 - *v*x* | *x*v* ) as_opts=-vx ;;
3.36 - *v* ) as_opts=-v ;;
3.37 - *x* ) as_opts=-x ;;
3.38 - * ) as_opts= ;;
3.39 -esac
3.40 -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
3.41 -# Admittedly, this is quite paranoid, since all the known shells bail
3.42 -# out after a failed `exec'.
3.43 -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
3.44 -as_fn_exit 255
3.45 - fi
3.46 - # We don't want this to propagate to other subprocesses.
3.47 - { _as_can_reexec=; unset _as_can_reexec;}
3.48 if test "x$CONFIG_SHELL" = x; then
3.49 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
3.50 emulate sh
3.51 @@ -192,8 +169,7 @@
3.52 else
3.53 exitcode=1; echo positional parameters were not saved.
3.54 fi
3.55 -test x\$exitcode = x0 || exit 1
3.56 -test -x / || exit 1"
3.57 +test x\$exitcode = x0 || exit 1"
3.58 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
3.59 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
3.60 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
3.61 @@ -237,25 +213,21 @@
3.62
3.63
3.64 if test "x$CONFIG_SHELL" != x; then :
3.65 - export CONFIG_SHELL
3.66 - # We cannot yet assume a decent shell, so we have to provide a
3.67 -# neutralization value for shells without unset; and this also
3.68 -# works around shells that cannot unset nonexistent variables.
3.69 -# Preserve -v and -x to the replacement shell.
3.70 -BASH_ENV=/dev/null
3.71 -ENV=/dev/null
3.72 -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
3.73 -case $- in @%:@ ((((
3.74 - *v*x* | *x*v* ) as_opts=-vx ;;
3.75 - *v* ) as_opts=-v ;;
3.76 - *x* ) as_opts=-x ;;
3.77 - * ) as_opts= ;;
3.78 -esac
3.79 -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
3.80 -# Admittedly, this is quite paranoid, since all the known shells bail
3.81 -# out after a failed `exec'.
3.82 -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
3.83 -exit 255
3.84 + # We cannot yet assume a decent shell, so we have to provide a
3.85 + # neutralization value for shells without unset; and this also
3.86 + # works around shells that cannot unset nonexistent variables.
3.87 + # Preserve -v and -x to the replacement shell.
3.88 + BASH_ENV=/dev/null
3.89 + ENV=/dev/null
3.90 + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
3.91 + export CONFIG_SHELL
3.92 + case $- in @%:@ ((((
3.93 + *v*x* | *x*v* ) as_opts=-vx ;;
3.94 + *v* ) as_opts=-v ;;
3.95 + *x* ) as_opts=-x ;;
3.96 + * ) as_opts= ;;
3.97 + esac
3.98 + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
3.99 fi
3.100
3.101 if test x$as_have_required = xno; then :
3.102 @@ -358,14 +330,6 @@
3.103
3.104
3.105 } @%:@ as_fn_mkdir_p
3.106 -
3.107 -@%:@ as_fn_executable_p FILE
3.108 -@%:@ -----------------------
3.109 -@%:@ Test if FILE is an executable regular file.
3.110 -as_fn_executable_p ()
3.111 -{
3.112 - test -f "$1" && test -x "$1"
3.113 -} @%:@ as_fn_executable_p
3.114 @%:@ as_fn_append VAR VALUE
3.115 @%:@ ----------------------
3.116 @%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
3.117 @@ -487,10 +451,6 @@
3.118 chmod +x "$as_me.lineno" ||
3.119 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
3.120
3.121 - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
3.122 - # already done that, so ensure we don't try to do so again and fall
3.123 - # in an infinite loop. This has already happened in practice.
3.124 - _as_can_reexec=no; export _as_can_reexec
3.125 # Don't try to exec as it changes $[0], causing all sort of problems
3.126 # (the dirname of $[0] is not the place where we might find the
3.127 # original and so on. Autoconf is especially sensitive to this).
3.128 @@ -525,16 +485,16 @@
3.129 # ... but there are two gotchas:
3.130 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
3.131 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
3.132 - # In both cases, we have to default to `cp -pR'.
3.133 + # In both cases, we have to default to `cp -p'.
3.134 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
3.135 - as_ln_s='cp -pR'
3.136 + as_ln_s='cp -p'
3.137 elif ln conf$$.file conf$$ 2>/dev/null; then
3.138 as_ln_s=ln
3.139 else
3.140 - as_ln_s='cp -pR'
3.141 + as_ln_s='cp -p'
3.142 fi
3.143 else
3.144 - as_ln_s='cp -pR'
3.145 + as_ln_s='cp -p'
3.146 fi
3.147 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
3.148 rmdir conf$$.dir 2>/dev/null
3.149 @@ -546,8 +506,28 @@
3.150 as_mkdir_p=false
3.151 fi
3.152
3.153 -as_test_x='test -x'
3.154 -as_executable_p=as_fn_executable_p
3.155 +if test -x / >/dev/null 2>&1; then
3.156 + as_test_x='test -x'
3.157 +else
3.158 + if ls -dL / >/dev/null 2>&1; then
3.159 + as_ls_L_option=L
3.160 + else
3.161 + as_ls_L_option=
3.162 + fi
3.163 + as_test_x='
3.164 + eval sh -c '\''
3.165 + if test -d "$1"; then
3.166 + test -d "$1/.";
3.167 + else
3.168 + case $1 in @%:@(
3.169 + -*)set "./$1";;
3.170 + esac;
3.171 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
3.172 + ???[sx]*):;;*)false;;esac;fi
3.173 + '\'' sh
3.174 + '
3.175 +fi
3.176 +as_executable_p=$as_test_x
3.177
3.178 # Sed expression to map a string onto a valid CPP name.
3.179 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
3.180 @@ -625,10 +605,6 @@
3.181 LDFLAGS
3.182 CFLAGS
3.183 CC
3.184 -AM_BACKSLASH
3.185 -AM_DEFAULT_VERBOSITY
3.186 -AM_DEFAULT_V
3.187 -AM_V
3.188 am__untar
3.189 am__tar
3.190 AMTAR
3.191 @@ -693,7 +669,6 @@
3.192 ac_subst_files=''
3.193 ac_user_opts='
3.194 enable_option_checking
3.195 -enable_silent_rules
3.196 enable_dependency_tracking
3.197 enable_maintainer_mode
3.198 '
3.199 @@ -1163,6 +1138,8 @@
3.200 if test "x$host_alias" != x; then
3.201 if test "x$build_alias" = x; then
3.202 cross_compiling=maybe
3.203 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
3.204 + If a cross compiler is detected then cross compile mode will be used" >&2
3.205 elif test "x$build_alias" != "x$host_alias"; then
3.206 cross_compiling=yes
3.207 fi
3.208 @@ -1326,15 +1303,10 @@
3.209 --disable-option-checking ignore unrecognized --enable/--with options
3.210 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
3.211 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
3.212 - --enable-silent-rules less verbose build output (undo: "make V=1")
3.213 - --disable-silent-rules verbose build output (undo: "make V=0")
3.214 - --enable-dependency-tracking
3.215 - do not reject slow dependency extractors
3.216 - --disable-dependency-tracking
3.217 - speeds up one-time build
3.218 - --enable-maintainer-mode
3.219 - enable make rules and dependencies not useful (and
3.220 - sometimes confusing) to the casual installer
3.221 + --disable-dependency-tracking speeds up one-time build
3.222 + --enable-dependency-tracking do not reject slow dependency extractors
3.223 + --enable-maintainer-mode enable make rules and dependencies not useful
3.224 + (and sometimes confusing) to the casual installer
3.225
3.226 Some influential environment variables:
3.227 CC C compiler command
3.228 @@ -1414,9 +1386,9 @@
3.229 if $ac_init_version; then
3.230 cat <<\_ACEOF
3.231 ltplib configure 0.1
3.232 -generated by GNU Autoconf 2.69
3.233 -
3.234 -Copyright (C) 2012 Free Software Foundation, Inc.
3.235 +generated by GNU Autoconf 2.68
3.236 +
3.237 +Copyright (C) 2010 Free Software Foundation, Inc.
3.238 This configure script is free software; the Free Software Foundation
3.239 gives unlimited permission to copy, distribute and modify it.
3.240 _ACEOF
3.241 @@ -1507,7 +1479,7 @@
3.242 running configure, to aid debugging if configure makes a mistake.
3.243
3.244 It was created by ltplib $as_me 0.1, which was
3.245 -generated by GNU Autoconf 2.69. Invocation command line was
3.246 +generated by GNU Autoconf 2.68. Invocation command line was
3.247
3.248 $ $0 $@
3.249
3.250 @@ -1856,7 +1828,7 @@
3.251
3.252 ac_config_headers="$ac_config_headers config.h"
3.253
3.254 -am__api_version='1.13'
3.255 +am__api_version='1.11'
3.256
3.257 ac_aux_dir=
3.258 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
3.259 @@ -1924,7 +1896,7 @@
3.260 # by default.
3.261 for ac_prog in ginstall scoinst install; do
3.262 for ac_exec_ext in '' $ac_executable_extensions; do
3.263 - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
3.264 + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
3.265 if test $ac_prog = install &&
3.266 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
3.267 # AIX install. It has an incompatible calling convention.
3.268 @@ -1982,6 +1954,9 @@
3.269
3.270 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
3.271 $as_echo_n "checking whether build environment is sane... " >&6; }
3.272 +# Just in case
3.273 +sleep 1
3.274 +echo timestamp > conftest.file
3.275 # Reject unsafe characters in $srcdir or the absolute working directory
3.276 # name. Accept space and tab only in the latter.
3.277 am_lf='
3.278 @@ -1992,40 +1967,32 @@
3.279 esac
3.280 case $srcdir in
3.281 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
3.282 - as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
3.283 + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
3.284 esac
3.285
3.286 -# Do 'set' in a subshell so we don't clobber the current shell's
3.287 +# Do `set' in a subshell so we don't clobber the current shell's
3.288 # arguments. Must try -L first in case configure is actually a
3.289 # symlink; some systems play weird games with the mod time of symlinks
3.290 # (eg FreeBSD returns the mod time of the symlink's containing
3.291 # directory).
3.292 if (
3.293 - am_has_slept=no
3.294 - for am_try in 1 2; do
3.295 - echo "timestamp, slept: $am_has_slept" > conftest.file
3.296 - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
3.297 - if test "$*" = "X"; then
3.298 - # -L didn't work.
3.299 - set X `ls -t "$srcdir/configure" conftest.file`
3.300 - fi
3.301 - if test "$*" != "X $srcdir/configure conftest.file" \
3.302 - && test "$*" != "X conftest.file $srcdir/configure"; then
3.303 -
3.304 - # If neither matched, then we have a broken ls. This can happen
3.305 - # if, for instance, CONFIG_SHELL is bash and it inherits a
3.306 - # broken ls alias from the environment. This has actually
3.307 - # happened. Such a system could not be considered "sane".
3.308 - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
3.309 - alias in your environment" "$LINENO" 5
3.310 - fi
3.311 - if test "$2" = conftest.file || test $am_try -eq 2; then
3.312 - break
3.313 - fi
3.314 - # Just in case.
3.315 - sleep 1
3.316 - am_has_slept=yes
3.317 - done
3.318 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
3.319 + if test "$*" = "X"; then
3.320 + # -L didn't work.
3.321 + set X `ls -t "$srcdir/configure" conftest.file`
3.322 + fi
3.323 + rm -f conftest.file
3.324 + if test "$*" != "X $srcdir/configure conftest.file" \
3.325 + && test "$*" != "X conftest.file $srcdir/configure"; then
3.326 +
3.327 + # If neither matched, then we have a broken ls. This can happen
3.328 + # if, for instance, CONFIG_SHELL is bash and it inherits a
3.329 + # broken ls alias from the environment. This has actually
3.330 + # happened. Such a system could not be considered "sane".
3.331 + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
3.332 +alias in your environment" "$LINENO" 5
3.333 + fi
3.334 +
3.335 test "$2" = conftest.file
3.336 )
3.337 then
3.338 @@ -2037,16 +2004,6 @@
3.339 fi
3.340 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3.341 $as_echo "yes" >&6; }
3.342 -# If we didn't sleep, we still need to ensure time stamps of config.status and
3.343 -# generated files are strictly newer.
3.344 -am_sleep_pid=
3.345 -if grep 'slept: no' conftest.file >/dev/null 2>&1; then
3.346 - ( sleep 1 ) &
3.347 - am_sleep_pid=$!
3.348 -fi
3.349 -
3.350 -rm -f conftest.file
3.351 -
3.352 test "$program_prefix" != NONE &&
3.353 program_transform_name="s&^&$program_prefix&;$program_transform_name"
3.354 # Use a double $ so make ignores it.
3.355 @@ -2069,12 +2026,12 @@
3.356 esac
3.357 fi
3.358 # Use eval to expand $SHELL
3.359 -if eval "$MISSING --is-lightweight"; then
3.360 - am_missing_run="$MISSING "
3.361 +if eval "$MISSING --run true"; then
3.362 + am_missing_run="$MISSING --run "
3.363 else
3.364 am_missing_run=
3.365 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
3.366 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
3.367 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
3.368 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
3.369 fi
3.370
3.371 if test x"${install_sh}" != xset; then
3.372 @@ -2086,10 +2043,10 @@
3.373 esac
3.374 fi
3.375
3.376 -# Installed binaries are usually stripped using 'strip' when the user
3.377 -# run "make install-strip". However 'strip' might not be the right
3.378 +# Installed binaries are usually stripped using `strip' when the user
3.379 +# run `make install-strip'. However `strip' might not be the right
3.380 # tool to use in cross-compilation environments, therefore Automake
3.381 -# will honor the 'STRIP' environment variable to overrule this program.
3.382 +# will honor the `STRIP' environment variable to overrule this program.
3.383 if test "$cross_compiling" != no; then
3.384 if test -n "$ac_tool_prefix"; then
3.385 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
3.386 @@ -2108,7 +2065,7 @@
3.387 IFS=$as_save_IFS
3.388 test -z "$as_dir" && as_dir=.
3.389 for ac_exec_ext in '' $ac_executable_extensions; do
3.390 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.391 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.392 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
3.393 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3.394 break 2
3.395 @@ -2148,7 +2105,7 @@
3.396 IFS=$as_save_IFS
3.397 test -z "$as_dir" && as_dir=.
3.398 for ac_exec_ext in '' $ac_executable_extensions; do
3.399 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.400 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.401 ac_cv_prog_ac_ct_STRIP="strip"
3.402 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3.403 break 2
3.404 @@ -2199,7 +2156,7 @@
3.405 test -z "$as_dir" && as_dir=.
3.406 for ac_prog in mkdir gmkdir; do
3.407 for ac_exec_ext in '' $ac_executable_extensions; do
3.408 - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
3.409 + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
3.410 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
3.411 'mkdir (GNU coreutils) '* | \
3.412 'mkdir (coreutils) '* | \
3.413 @@ -2228,6 +2185,12 @@
3.414 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
3.415 $as_echo "$MKDIR_P" >&6; }
3.416
3.417 +mkdir_p="$MKDIR_P"
3.418 +case $mkdir_p in
3.419 + [\\/$]* | ?:[\\/]*) ;;
3.420 + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3.421 +esac
3.422 +
3.423 for ac_prog in gawk mawk nawk awk
3.424 do
3.425 # Extract the first word of "$ac_prog", so it can be a program name with args.
3.426 @@ -2246,7 +2209,7 @@
3.427 IFS=$as_save_IFS
3.428 test -z "$as_dir" && as_dir=.
3.429 for ac_exec_ext in '' $ac_executable_extensions; do
3.430 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.431 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.432 ac_cv_prog_AWK="$ac_prog"
3.433 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3.434 break 2
3.435 @@ -2310,45 +2273,6 @@
3.436 fi
3.437 rmdir .tst 2>/dev/null
3.438
3.439 -@%:@ Check whether --enable-silent-rules was given.
3.440 -if test "${enable_silent_rules+set}" = set; then :
3.441 - enableval=$enable_silent_rules;
3.442 -fi
3.443 -
3.444 -case $enable_silent_rules in @%:@ (((
3.445 - yes) AM_DEFAULT_VERBOSITY=0;;
3.446 - no) AM_DEFAULT_VERBOSITY=1;;
3.447 - *) AM_DEFAULT_VERBOSITY=1;;
3.448 -esac
3.449 -am_make=${MAKE-make}
3.450 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
3.451 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
3.452 -if ${am_cv_make_support_nested_variables+:} false; then :
3.453 - $as_echo_n "(cached) " >&6
3.454 -else
3.455 - if $as_echo 'TRUE=$(BAR$(V))
3.456 -BAR0=false
3.457 -BAR1=true
3.458 -V=1
3.459 -am__doit:
3.460 - @$(TRUE)
3.461 -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
3.462 - am_cv_make_support_nested_variables=yes
3.463 -else
3.464 - am_cv_make_support_nested_variables=no
3.465 -fi
3.466 -fi
3.467 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
3.468 -$as_echo "$am_cv_make_support_nested_variables" >&6; }
3.469 -if test $am_cv_make_support_nested_variables = yes; then
3.470 - AM_V='$(V)'
3.471 - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
3.472 -else
3.473 - AM_V=$AM_DEFAULT_VERBOSITY
3.474 - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
3.475 -fi
3.476 -AM_BACKSLASH='\'
3.477 -
3.478 if test "`cd $srcdir && pwd`" != "`pwd`"; then
3.479 # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
3.480 # is not polluted with repeated "-I."
3.481 @@ -2399,28 +2323,17 @@
3.482
3.483 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3.484
3.485 -# For better backward compatibility. To be removed once Automake 1.9.x
3.486 -# dies out for good. For more background, see:
3.487 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
3.488 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
3.489 -mkdir_p='$(MKDIR_P)'
3.490 -
3.491 # We need awk for the "check" target. The system "awk" is bad on
3.492 # some platforms.
3.493 # Always define AMTAR for backward compatibility. Yes, it's still used
3.494 # in the wild :-( We should find a proper way to deprecate it ...
3.495 AMTAR='$${TAR-tar}'
3.496
3.497 -
3.498 -# We'll loop over all known methods to create a tar archive until one works.
3.499 -_am_tools='gnutar pax cpio none'
3.500 -
3.501 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
3.502
3.503
3.504
3.505
3.506 -
3.507
3.508
3.509 ac_ext=c
3.510 @@ -2445,7 +2358,7 @@
3.511 IFS=$as_save_IFS
3.512 test -z "$as_dir" && as_dir=.
3.513 for ac_exec_ext in '' $ac_executable_extensions; do
3.514 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.515 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.516 ac_cv_prog_CC="${ac_tool_prefix}gcc"
3.517 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3.518 break 2
3.519 @@ -2485,7 +2398,7 @@
3.520 IFS=$as_save_IFS
3.521 test -z "$as_dir" && as_dir=.
3.522 for ac_exec_ext in '' $ac_executable_extensions; do
3.523 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.524 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.525 ac_cv_prog_ac_ct_CC="gcc"
3.526 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3.527 break 2
3.528 @@ -2538,7 +2451,7 @@
3.529 IFS=$as_save_IFS
3.530 test -z "$as_dir" && as_dir=.
3.531 for ac_exec_ext in '' $ac_executable_extensions; do
3.532 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.533 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.534 ac_cv_prog_CC="${ac_tool_prefix}cc"
3.535 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3.536 break 2
3.537 @@ -2579,7 +2492,7 @@
3.538 IFS=$as_save_IFS
3.539 test -z "$as_dir" && as_dir=.
3.540 for ac_exec_ext in '' $ac_executable_extensions; do
3.541 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.542 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.543 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
3.544 ac_prog_rejected=yes
3.545 continue
3.546 @@ -2637,7 +2550,7 @@
3.547 IFS=$as_save_IFS
3.548 test -z "$as_dir" && as_dir=.
3.549 for ac_exec_ext in '' $ac_executable_extensions; do
3.550 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.551 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.552 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3.553 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3.554 break 2
3.555 @@ -2681,7 +2594,7 @@
3.556 IFS=$as_save_IFS
3.557 test -z "$as_dir" && as_dir=.
3.558 for ac_exec_ext in '' $ac_executable_extensions; do
3.559 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.560 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.561 ac_cv_prog_ac_ct_CC="$ac_prog"
3.562 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3.563 break 2
3.564 @@ -3127,7 +3040,8 @@
3.565 /* end confdefs.h. */
3.566 #include <stdarg.h>
3.567 #include <stdio.h>
3.568 -struct stat;
3.569 +#include <sys/types.h>
3.570 +#include <sys/stat.h>
3.571 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
3.572 struct buf { int x; };
3.573 FILE * (*rcsopen) (struct buf *, struct stat *, int);
3.574 @@ -3230,7 +3144,7 @@
3.575 _am_result=none
3.576 # First try GNU make style include.
3.577 echo "include confinc" > confmf
3.578 -# Ignore all kinds of additional output from 'make'.
3.579 +# Ignore all kinds of additional output from `make'.
3.580 case `$am_make -s -f confmf 2> /dev/null` in #(
3.581 *the\ am__doit\ target*)
3.582 am__include=include
3.583 @@ -3286,8 +3200,8 @@
3.584 # We make a subdir and do the tests there. Otherwise we can end up
3.585 # making bogus files that we don't know about and never remove. For
3.586 # instance it was reported that on HP-UX the gcc test will end up
3.587 - # making a dummy file named 'D' -- because '-MD' means "put the output
3.588 - # in D".
3.589 + # making a dummy file named `D' -- because `-MD' means `put the output
3.590 + # in D'.
3.591 rm -rf conftest.dir
3.592 mkdir conftest.dir
3.593 # Copy depcomp to subdir because otherwise we won't find it if we're
3.594 @@ -3322,16 +3236,16 @@
3.595 : > sub/conftest.c
3.596 for i in 1 2 3 4 5 6; do
3.597 echo '#include "conftst'$i'.h"' >> sub/conftest.c
3.598 - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
3.599 - # Solaris 10 /bin/sh.
3.600 - echo '/* dummy */' > sub/conftst$i.h
3.601 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
3.602 + # Solaris 8's {/usr,}/bin/sh.
3.603 + touch sub/conftst$i.h
3.604 done
3.605 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
3.606
3.607 - # We check with '-c' and '-o' for the sake of the "dashmstdout"
3.608 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
3.609 # mode. It turns out that the SunPro C++ compiler does not properly
3.610 - # handle '-M -o', and we need to detect this. Also, some Intel
3.611 - # versions had trouble with output in subdirs.
3.612 + # handle `-M -o', and we need to detect this. Also, some Intel
3.613 + # versions had trouble with output in subdirs
3.614 am__obj=sub/conftest.${OBJEXT-o}
3.615 am__minus_obj="-o $am__obj"
3.616 case $depmode in
3.617 @@ -3340,8 +3254,8 @@
3.618 test "$am__universal" = false || continue
3.619 ;;
3.620 nosideeffect)
3.621 - # After this tag, mechanisms are not by side-effect, so they'll
3.622 - # only be used when explicitly requested.
3.623 + # after this tag, mechanisms are not by side-effect, so they'll
3.624 + # only be used when explicitly requested
3.625 if test "x$enable_dependency_tracking" = xyes; then
3.626 continue
3.627 else
3.628 @@ -3349,7 +3263,7 @@
3.629 fi
3.630 ;;
3.631 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
3.632 - # This compiler won't grok '-c -o', but also, the minuso test has
3.633 + # This compiler won't grok `-c -o', but also, the minuso test has
3.634 # not run yet. These depmodes are late enough in the game, and
3.635 # so weak that their functioning should not be impacted.
3.636 am__obj=conftest.${OBJEXT-o}
3.637 @@ -3431,7 +3345,7 @@
3.638 IFS=$as_save_IFS
3.639 test -z "$as_dir" && as_dir=.
3.640 for ac_exec_ext in '' $ac_executable_extensions; do
3.641 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.642 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.643 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
3.644 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3.645 break 2
3.646 @@ -3475,7 +3389,7 @@
3.647 IFS=$as_save_IFS
3.648 test -z "$as_dir" && as_dir=.
3.649 for ac_exec_ext in '' $ac_executable_extensions; do
3.650 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.651 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.652 ac_cv_prog_ac_ct_CXX="$ac_prog"
3.653 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3.654 break 2
3.655 @@ -3671,8 +3585,8 @@
3.656 # We make a subdir and do the tests there. Otherwise we can end up
3.657 # making bogus files that we don't know about and never remove. For
3.658 # instance it was reported that on HP-UX the gcc test will end up
3.659 - # making a dummy file named 'D' -- because '-MD' means "put the output
3.660 - # in D".
3.661 + # making a dummy file named `D' -- because `-MD' means `put the output
3.662 + # in D'.
3.663 rm -rf conftest.dir
3.664 mkdir conftest.dir
3.665 # Copy depcomp to subdir because otherwise we won't find it if we're
3.666 @@ -3707,16 +3621,16 @@
3.667 : > sub/conftest.c
3.668 for i in 1 2 3 4 5 6; do
3.669 echo '#include "conftst'$i'.h"' >> sub/conftest.c
3.670 - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
3.671 - # Solaris 10 /bin/sh.
3.672 - echo '/* dummy */' > sub/conftst$i.h
3.673 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
3.674 + # Solaris 8's {/usr,}/bin/sh.
3.675 + touch sub/conftst$i.h
3.676 done
3.677 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
3.678
3.679 - # We check with '-c' and '-o' for the sake of the "dashmstdout"
3.680 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
3.681 # mode. It turns out that the SunPro C++ compiler does not properly
3.682 - # handle '-M -o', and we need to detect this. Also, some Intel
3.683 - # versions had trouble with output in subdirs.
3.684 + # handle `-M -o', and we need to detect this. Also, some Intel
3.685 + # versions had trouble with output in subdirs
3.686 am__obj=sub/conftest.${OBJEXT-o}
3.687 am__minus_obj="-o $am__obj"
3.688 case $depmode in
3.689 @@ -3725,8 +3639,8 @@
3.690 test "$am__universal" = false || continue
3.691 ;;
3.692 nosideeffect)
3.693 - # After this tag, mechanisms are not by side-effect, so they'll
3.694 - # only be used when explicitly requested.
3.695 + # after this tag, mechanisms are not by side-effect, so they'll
3.696 + # only be used when explicitly requested
3.697 if test "x$enable_dependency_tracking" = xyes; then
3.698 continue
3.699 else
3.700 @@ -3734,7 +3648,7 @@
3.701 fi
3.702 ;;
3.703 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
3.704 - # This compiler won't grok '-c -o', but also, the minuso test has
3.705 + # This compiler won't grok `-c -o', but also, the minuso test has
3.706 # not run yet. These depmodes are late enough in the game, and
3.707 # so weak that their functioning should not be impacted.
3.708 am__obj=conftest.${OBJEXT-o}
3.709 @@ -3805,7 +3719,7 @@
3.710 IFS=$as_save_IFS
3.711 test -z "$as_dir" && as_dir=.
3.712 for ac_exec_ext in '' $ac_executable_extensions; do
3.713 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.714 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.715 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
3.716 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3.717 break 2
3.718 @@ -3845,7 +3759,7 @@
3.719 IFS=$as_save_IFS
3.720 test -z "$as_dir" && as_dir=.
3.721 for ac_exec_ext in '' $ac_executable_extensions; do
3.722 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3.723 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.724 ac_cv_prog_ac_ct_RANLIB="ranlib"
3.725 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3.726 break 2
3.727 @@ -4188,6 +4102,7 @@
3.728
3.729 ac_libobjs=
3.730 ac_ltlibobjs=
3.731 +U=
3.732 for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
3.733 # 1. Remove the extension, and $U if already installed.
3.734 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
3.735 @@ -4202,14 +4117,6 @@
3.736 LTLIBOBJS=$ac_ltlibobjs
3.737
3.738
3.739 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
3.740 -$as_echo_n "checking that generated files are newer than configure... " >&6; }
3.741 - if test -n "$am_sleep_pid"; then
3.742 - # Hide warnings about reused PIDs.
3.743 - wait $am_sleep_pid 2>/dev/null
3.744 - fi
3.745 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
3.746 -$as_echo "done" >&6; }
3.747 if test -n "$EXEEXT"; then
3.748 am__EXEEXT_TRUE=
3.749 am__EXEEXT_FALSE='#'
3.750 @@ -4540,16 +4447,16 @@
3.751 # ... but there are two gotchas:
3.752 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
3.753 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
3.754 - # In both cases, we have to default to `cp -pR'.
3.755 + # In both cases, we have to default to `cp -p'.
3.756 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
3.757 - as_ln_s='cp -pR'
3.758 + as_ln_s='cp -p'
3.759 elif ln conf$$.file conf$$ 2>/dev/null; then
3.760 as_ln_s=ln
3.761 else
3.762 - as_ln_s='cp -pR'
3.763 + as_ln_s='cp -p'
3.764 fi
3.765 else
3.766 - as_ln_s='cp -pR'
3.767 + as_ln_s='cp -p'
3.768 fi
3.769 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
3.770 rmdir conf$$.dir 2>/dev/null
3.771 @@ -4609,16 +4516,28 @@
3.772 as_mkdir_p=false
3.773 fi
3.774
3.775 -
3.776 -@%:@ as_fn_executable_p FILE
3.777 -@%:@ -----------------------
3.778 -@%:@ Test if FILE is an executable regular file.
3.779 -as_fn_executable_p ()
3.780 -{
3.781 - test -f "$1" && test -x "$1"
3.782 -} @%:@ as_fn_executable_p
3.783 -as_test_x='test -x'
3.784 -as_executable_p=as_fn_executable_p
3.785 +if test -x / >/dev/null 2>&1; then
3.786 + as_test_x='test -x'
3.787 +else
3.788 + if ls -dL / >/dev/null 2>&1; then
3.789 + as_ls_L_option=L
3.790 + else
3.791 + as_ls_L_option=
3.792 + fi
3.793 + as_test_x='
3.794 + eval sh -c '\''
3.795 + if test -d "$1"; then
3.796 + test -d "$1/.";
3.797 + else
3.798 + case $1 in @%:@(
3.799 + -*)set "./$1";;
3.800 + esac;
3.801 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
3.802 + ???[sx]*):;;*)false;;esac;fi
3.803 + '\'' sh
3.804 + '
3.805 +fi
3.806 +as_executable_p=$as_test_x
3.807
3.808 # Sed expression to map a string onto a valid CPP name.
3.809 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
3.810 @@ -4640,7 +4559,7 @@
3.811 # values after options handling.
3.812 ac_log="
3.813 This file was extended by ltplib $as_me 0.1, which was
3.814 -generated by GNU Autoconf 2.69. Invocation command line was
3.815 +generated by GNU Autoconf 2.68. Invocation command line was
3.816
3.817 CONFIG_FILES = $CONFIG_FILES
3.818 CONFIG_HEADERS = $CONFIG_HEADERS
3.819 @@ -4706,10 +4625,10 @@
3.820 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
3.821 ac_cs_version="\\
3.822 ltplib config.status 0.1
3.823 -configured by $0, generated by GNU Autoconf 2.69,
3.824 +configured by $0, generated by GNU Autoconf 2.68,
3.825 with options \\"\$ac_cs_config\\"
3.826
3.827 -Copyright (C) 2012 Free Software Foundation, Inc.
3.828 +Copyright (C) 2010 Free Software Foundation, Inc.
3.829 This config.status script is free software; the Free Software Foundation
3.830 gives unlimited permission to copy, distribute and modify it."
3.831
3.832 @@ -4800,7 +4719,7 @@
3.833 _ACEOF
3.834 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3.835 if \$ac_cs_recheck; then
3.836 - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
3.837 + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
3.838 shift
3.839 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
3.840 CONFIG_SHELL='$SHELL'
3.841 @@ -5437,7 +5356,7 @@
3.842
3.843 case $ac_file$ac_mode in
3.844 "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
3.845 - # Older Autoconf quotes --file arguments for eval, but not when files
3.846 + # Autoconf 2.62 quotes --file arguments for eval, but not when files
3.847 # are listed without --file. Let's play safe and only enable the eval
3.848 # if we detect the quoting.
3.849 case $CONFIG_FILES in
3.850 @@ -5450,7 +5369,7 @@
3.851 # Strip MF so we end up with the name of the file.
3.852 mf=`echo "$mf" | sed -e 's/:.*$//'`
3.853 # Check whether this is an Automake generated Makefile or not.
3.854 - # We used to match only the files named 'Makefile.in', but
3.855 + # We used to match only the files named `Makefile.in', but
3.856 # some people rename them; so instead we look at the file content.
3.857 # Grep'ing the first line is not enough: some people post-process
3.858 # each Makefile.in and add a new line on top of each file to say so.
3.859 @@ -5484,19 +5403,21 @@
3.860 continue
3.861 fi
3.862 # Extract the definition of DEPDIR, am__include, and am__quote
3.863 - # from the Makefile without running 'make'.
3.864 + # from the Makefile without running `make'.
3.865 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
3.866 test -z "$DEPDIR" && continue
3.867 am__include=`sed -n 's/^am__include = //p' < "$mf"`
3.868 - test -z "$am__include" && continue
3.869 + test -z "am__include" && continue
3.870 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
3.871 + # When using ansi2knr, U may be empty or an underscore; expand it
3.872 + U=`sed -n 's/^U = //p' < "$mf"`
3.873 # Find all dependency output files, they are included files with
3.874 # $(DEPDIR) in their names. We invoke sed twice because it is the
3.875 # simplest approach to changing $(DEPDIR) to its actual value in the
3.876 # expansion.
3.877 for file in `sed -n "
3.878 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
3.879 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
3.880 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
3.881 # Make sure the directory exists.
3.882 test -f "$dirpart/$file" && continue
3.883 fdir=`$as_dirname -- "$file" ||
4.1 --- a/autom4te.cache/requests Fri Mar 28 16:21:31 2014 +0000
4.2 +++ b/autom4te.cache/requests Sat Mar 29 13:10:05 2014 +0000
4.3 @@ -1,4 +1,4 @@
4.4 -# This file was generated by Autom4te Wed Aug 21 09:31:00 UTC 2013.
4.5 +# This file was generated by Autom4te Sun Nov 6 20:57:04 UTC 2011.
4.6 # It contains the lists of macros which have been traced.
4.7 # It can be safely removed.
4.8
4.9 @@ -11,34 +11,35 @@
4.10 ],
4.11 [
4.12 '/usr/share/autoconf/autoconf/autoconf.m4f',
4.13 - '-',
4.14 - '/usr/share/aclocal-1.13/internal/ac-config-macro-dirs.m4',
4.15 - '/usr/share/aclocal-1.13/amversion.m4',
4.16 - '/usr/share/aclocal-1.13/auxdir.m4',
4.17 - '/usr/share/aclocal-1.13/cond.m4',
4.18 - '/usr/share/aclocal-1.13/depend.m4',
4.19 - '/usr/share/aclocal-1.13/depout.m4',
4.20 - '/usr/share/aclocal-1.13/init.m4',
4.21 - '/usr/share/aclocal-1.13/install-sh.m4',
4.22 - '/usr/share/aclocal-1.13/lead-dot.m4',
4.23 - '/usr/share/aclocal-1.13/maintainer.m4',
4.24 - '/usr/share/aclocal-1.13/make.m4',
4.25 - '/usr/share/aclocal-1.13/missing.m4',
4.26 - '/usr/share/aclocal-1.13/obsolete.m4',
4.27 - '/usr/share/aclocal-1.13/options.m4',
4.28 - '/usr/share/aclocal-1.13/runlog.m4',
4.29 - '/usr/share/aclocal-1.13/sanity.m4',
4.30 - '/usr/share/aclocal-1.13/silent.m4',
4.31 - '/usr/share/aclocal-1.13/strip.m4',
4.32 - '/usr/share/aclocal-1.13/substnot.m4',
4.33 - '/usr/share/aclocal-1.13/tar.m4',
4.34 + '/usr/share/aclocal-1.11/amversion.m4',
4.35 + '/usr/share/aclocal-1.11/auxdir.m4',
4.36 + '/usr/share/aclocal-1.11/cond.m4',
4.37 + '/usr/share/aclocal-1.11/depend.m4',
4.38 + '/usr/share/aclocal-1.11/depout.m4',
4.39 + '/usr/share/aclocal-1.11/header.m4',
4.40 + '/usr/share/aclocal-1.11/init.m4',
4.41 + '/usr/share/aclocal-1.11/install-sh.m4',
4.42 + '/usr/share/aclocal-1.11/lead-dot.m4',
4.43 + '/usr/share/aclocal-1.11/maintainer.m4',
4.44 + '/usr/share/aclocal-1.11/make.m4',
4.45 + '/usr/share/aclocal-1.11/missing.m4',
4.46 + '/usr/share/aclocal-1.11/mkdirp.m4',
4.47 + '/usr/share/aclocal-1.11/options.m4',
4.48 + '/usr/share/aclocal-1.11/runlog.m4',
4.49 + '/usr/share/aclocal-1.11/sanity.m4',
4.50 + '/usr/share/aclocal-1.11/silent.m4',
4.51 + '/usr/share/aclocal-1.11/strip.m4',
4.52 + '/usr/share/aclocal-1.11/substnot.m4',
4.53 + '/usr/share/aclocal-1.11/tar.m4',
4.54 'configure.ac'
4.55 ],
4.56 {
4.57 'm4_pattern_forbid' => 1,
4.58 + 'jm_MAINTAINER_MODE' => 1,
4.59 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
4.60 '_AM_SET_OPTION' => 1,
4.61 'AC_DEFUN' => 1,
4.62 + 'AM_PROG_MKDIR_P' => 1,
4.63 'AM_INIT_AUTOMAKE' => 1,
4.64 'AM_AUTOMAKE_VERSION' => 1,
4.65 'AM_MISSING_HAS_RUN' => 1,
4.66 @@ -47,7 +48,6 @@
4.67 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
4.68 'AM_MAINTAINER_MODE' => 1,
4.69 'AC_DEFUN_ONCE' => 1,
4.70 - '_AM_CONFIG_MACRO_DIRS' => 1,
4.71 'AM_PROG_INSTALL_STRIP' => 1,
4.72 '_m4_warn' => 1,
4.73 'AM_SANITY_CHECK' => 1,
4.74 @@ -58,24 +58,19 @@
4.75 'AM_DEP_TRACK' => 1,
4.76 'AM_CONFIG_HEADER' => 1,
4.77 '_AM_SET_OPTIONS' => 1,
4.78 - 'AM_PROG_CC_STDC' => 1,
4.79 'AM_RUN_LOG' => 1,
4.80 '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
4.81 - 'AC_CONFIG_MACRO_DIR' => 1,
4.82 - 'AM_C_PROTOTYPES' => 1,
4.83 '_AM_IF_OPTION' => 1,
4.84 '_AM_SUBST_NOTMAKE' => 1,
4.85 'ACX_PTHREAD' => 1,
4.86 'm4_pattern_allow' => 1,
4.87 '_AM_AUTOCONF_VERSION' => 1,
4.88 '_AM_MANGLE_OPTION' => 1,
4.89 + 'AM_SET_LEADING_DOT' => 1,
4.90 'AM_CONDITIONAL' => 1,
4.91 - 'AM_SET_LEADING_DOT' => 1,
4.92 - 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
4.93 'AM_SET_DEPDIR' => 1,
4.94 '_AM_DEPENDENCIES' => 1,
4.95 'm4_include' => 1,
4.96 - 'fp_C_PROTOTYPES' => 1,
4.97 'AM_PROG_INSTALL_SH' => 1,
4.98 '_AC_AM_CONFIG_HEADER_HOOK' => 1,
4.99 'AU_DEFUN' => 1,
4.100 @@ -102,11 +97,9 @@
4.101 '_AM_COND_IF' => 1,
4.102 'AC_CONFIG_LIBOBJ_DIR' => 1,
4.103 'AC_SUBST' => 1,
4.104 - 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
4.105 'AC_CANONICAL_HOST' => 1,
4.106 'AC_FC_SRCEXT' => 1,
4.107 'AC_PROG_LIBTOOL' => 1,
4.108 - 'AM_PROG_MKDIR_P' => 1,
4.109 'AM_INIT_AUTOMAKE' => 1,
4.110 'AC_CONFIG_SUBDIRS' => 1,
4.111 'AM_PATH_GUILE' => 1,
4.112 @@ -118,7 +111,6 @@
4.113 'm4_sinclude' => 1,
4.114 'AM_MAINTAINER_MODE' => 1,
4.115 'AM_NLS' => 1,
4.116 - 'AC_FC_PP_DEFINE' => 1,
4.117 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
4.118 '_m4_warn' => 1,
4.119 'AM_MAKEFILE_INCLUDE' => 1,
4.120 @@ -126,8 +118,8 @@
4.121 '_AM_MAKEFILE_INCLUDE' => 1,
4.122 '_AM_COND_ENDIF' => 1,
4.123 'AM_ENABLE_MULTILIB' => 1,
4.124 + 'AM_SILENT_RULES' => 1,
4.125 'AM_PROG_MOC' => 1,
4.126 - 'AM_SILENT_RULES' => 1,
4.127 'AC_CONFIG_FILES' => 1,
4.128 'LT_INIT' => 1,
4.129 'include' => 1,
4.130 @@ -137,7 +129,6 @@
4.131 'AC_CANONICAL_BUILD' => 1,
4.132 'AM_PROG_FC_C_O' => 1,
4.133 'AC_FC_FREEFORM' => 1,
4.134 - 'AC_FC_PP_SRCEXT' => 1,
4.135 'AH_OUTPUT' => 1,
4.136 'AC_CONFIG_AUX_DIR' => 1,
4.137 '_AM_SUBST_NOTMAKE' => 1,
5.1 --- a/autom4te.cache/traces.0 Fri Mar 28 16:21:31 2014 +0000
5.2 +++ b/autom4te.cache/traces.0 Sat Mar 29 13:10:05 2014 +0000
5.3 @@ -1,21 +1,21 @@
5.4 -m4trace:/usr/share/aclocal-1.13/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.13'
5.5 +m4trace:/usr/share/aclocal-1.11/amversion.m4:17: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11'
5.6 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
5.7 dnl require some minimum version. Point them to the right macro.
5.8 -m4_if([$1], [1.13.3], [],
5.9 +m4_if([$1], [1.11.3], [],
5.10 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
5.11 ])
5.12 -m4trace:/usr/share/aclocal-1.13/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.13.3])dnl
5.13 +m4trace:/usr/share/aclocal-1.11/amversion.m4:36: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.11.3])dnl
5.14 m4_ifndef([AC_AUTOCONF_VERSION],
5.15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
5.16 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
5.17 -m4trace:/usr/share/aclocal-1.13/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
5.18 +m4trace:/usr/share/aclocal-1.11/auxdir.m4:49: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
5.19 AC_PREREQ([2.50])dnl
5.20 # expand $ac_aux_dir to an absolute path
5.21 am_aux_dir=`cd $ac_aux_dir && pwd`
5.22 ])
5.23 -m4trace:/usr/share/aclocal-1.13/cond.m4:12: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ([2.52])dnl
5.24 - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
5.25 - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
5.26 +m4trace:/usr/share/aclocal-1.11/cond.m4:15: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl
5.27 + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
5.28 + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
5.29 AC_SUBST([$1_TRUE])dnl
5.30 AC_SUBST([$1_FALSE])dnl
5.31 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
5.32 @@ -33,18 +33,17 @@
5.33 AC_MSG_ERROR([[conditional "$1" was never defined.
5.34 Usually this means the macro was only invoked conditionally.]])
5.35 fi])])
5.36 -m4trace:/usr/share/aclocal-1.13/depend.m4:26: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
5.37 +m4trace:/usr/share/aclocal-1.11/depend.m4:28: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
5.38 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
5.39 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
5.40 AC_REQUIRE([AM_DEP_TRACK])dnl
5.41
5.42 -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
5.43 - [$1], [CXX], [depcc="$CXX" am_compiler_list=],
5.44 - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
5.45 - [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
5.46 - [$1], [UPC], [depcc="$UPC" am_compiler_list=],
5.47 - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
5.48 - [depcc="$$1" am_compiler_list=])
5.49 +ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
5.50 + [$1], CXX, [depcc="$CXX" am_compiler_list=],
5.51 + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
5.52 + [$1], UPC, [depcc="$UPC" am_compiler_list=],
5.53 + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
5.54 + [depcc="$$1" am_compiler_list=])
5.55
5.56 AC_CACHE_CHECK([dependency style of $depcc],
5.57 [am_cv_$1_dependencies_compiler_type],
5.58 @@ -52,8 +51,8 @@
5.59 # We make a subdir and do the tests there. Otherwise we can end up
5.60 # making bogus files that we don't know about and never remove. For
5.61 # instance it was reported that on HP-UX the gcc test will end up
5.62 - # making a dummy file named 'D' -- because '-MD' means "put the output
5.63 - # in D".
5.64 + # making a dummy file named `D' -- because `-MD' means `put the output
5.65 + # in D'.
5.66 rm -rf conftest.dir
5.67 mkdir conftest.dir
5.68 # Copy depcomp to subdir because otherwise we won't find it if we're
5.69 @@ -93,16 +92,16 @@
5.70 : > sub/conftest.c
5.71 for i in 1 2 3 4 5 6; do
5.72 echo '#include "conftst'$i'.h"' >> sub/conftest.c
5.73 - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
5.74 - # Solaris 10 /bin/sh.
5.75 - echo '/* dummy */' > sub/conftst$i.h
5.76 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
5.77 + # Solaris 8's {/usr,}/bin/sh.
5.78 + touch sub/conftst$i.h
5.79 done
5.80 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
5.81
5.82 - # We check with '-c' and '-o' for the sake of the "dashmstdout"
5.83 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
5.84 # mode. It turns out that the SunPro C++ compiler does not properly
5.85 - # handle '-M -o', and we need to detect this. Also, some Intel
5.86 - # versions had trouble with output in subdirs.
5.87 + # handle `-M -o', and we need to detect this. Also, some Intel
5.88 + # versions had trouble with output in subdirs
5.89 am__obj=sub/conftest.${OBJEXT-o}
5.90 am__minus_obj="-o $am__obj"
5.91 case $depmode in
5.92 @@ -111,8 +110,8 @@
5.93 test "$am__universal" = false || continue
5.94 ;;
5.95 nosideeffect)
5.96 - # After this tag, mechanisms are not by side-effect, so they'll
5.97 - # only be used when explicitly requested.
5.98 + # after this tag, mechanisms are not by side-effect, so they'll
5.99 + # only be used when explicitly requested
5.100 if test "x$enable_dependency_tracking" = xyes; then
5.101 continue
5.102 else
5.103 @@ -120,7 +119,7 @@
5.104 fi
5.105 ;;
5.106 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
5.107 - # This compiler won't grok '-c -o', but also, the minuso test has
5.108 + # This compiler won't grok `-c -o', but also, the minuso test has
5.109 # not run yet. These depmodes are late enough in the game, and
5.110 # so weak that their functioning should not be impacted.
5.111 am__obj=conftest.${OBJEXT-o}
5.112 @@ -163,16 +162,12 @@
5.113 test "x$enable_dependency_tracking" != xno \
5.114 && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
5.115 ])
5.116 -m4trace:/usr/share/aclocal-1.13/depend.m4:163: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
5.117 +m4trace:/usr/share/aclocal-1.11/depend.m4:164: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
5.118 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
5.119 ])
5.120 -m4trace:/usr/share/aclocal-1.13/depend.m4:171: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE([dependency-tracking], [dnl
5.121 -AS_HELP_STRING(
5.122 - [--enable-dependency-tracking],
5.123 - [do not reject slow dependency extractors])
5.124 -AS_HELP_STRING(
5.125 - [--disable-dependency-tracking],
5.126 - [speeds up one-time build])])
5.127 +m4trace:/usr/share/aclocal-1.11/depend.m4:172: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking,
5.128 +[ --disable-dependency-tracking speeds up one-time build
5.129 + --enable-dependency-tracking do not reject slow dependency extractors])
5.130 if test "x$enable_dependency_tracking" != xno; then
5.131 am_depcomp="$ac_aux_dir/depcomp"
5.132 AMDEPBACKSLASH='\'
5.133 @@ -184,8 +179,8 @@
5.134 AC_SUBST([am__nodep])dnl
5.135 _AM_SUBST_NOTMAKE([am__nodep])dnl
5.136 ])
5.137 -m4trace:/usr/share/aclocal-1.13/depout.m4:12: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{
5.138 - # Older Autoconf quotes --file arguments for eval, but not when files
5.139 +m4trace:/usr/share/aclocal-1.11/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{
5.140 + # Autoconf 2.62 quotes --file arguments for eval, but not when files
5.141 # are listed without --file. Let's play safe and only enable the eval
5.142 # if we detect the quoting.
5.143 case $CONFIG_FILES in
5.144 @@ -198,7 +193,7 @@
5.145 # Strip MF so we end up with the name of the file.
5.146 mf=`echo "$mf" | sed -e 's/:.*$//'`
5.147 # Check whether this is an Automake generated Makefile or not.
5.148 - # We used to match only the files named 'Makefile.in', but
5.149 + # We used to match only the files named `Makefile.in', but
5.150 # some people rename them; so instead we look at the file content.
5.151 # Grep'ing the first line is not enough: some people post-process
5.152 # each Makefile.in and add a new line on top of each file to say so.
5.153 @@ -210,19 +205,21 @@
5.154 continue
5.155 fi
5.156 # Extract the definition of DEPDIR, am__include, and am__quote
5.157 - # from the Makefile without running 'make'.
5.158 + # from the Makefile without running `make'.
5.159 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
5.160 test -z "$DEPDIR" && continue
5.161 am__include=`sed -n 's/^am__include = //p' < "$mf"`
5.162 - test -z "$am__include" && continue
5.163 + test -z "am__include" && continue
5.164 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
5.165 + # When using ansi2knr, U may be empty or an underscore; expand it
5.166 + U=`sed -n 's/^U = //p' < "$mf"`
5.167 # Find all dependency output files, they are included files with
5.168 # $(DEPDIR) in their names. We invoke sed twice because it is the
5.169 # simplest approach to changing $(DEPDIR) to its actual value in the
5.170 # expansion.
5.171 for file in `sed -n "
5.172 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
5.173 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
5.174 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
5.175 # Make sure the directory exists.
5.176 test -f "$dirpart/$file" && continue
5.177 fdir=`AS_DIRNAME(["$file"])`
5.178 @@ -233,11 +230,15 @@
5.179 done
5.180 }
5.181 ])
5.182 -m4trace:/usr/share/aclocal-1.13/depout.m4:71: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
5.183 +m4trace:/usr/share/aclocal-1.11/depout.m4:75: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
5.184 [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
5.185 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
5.186 ])
5.187 -m4trace:/usr/share/aclocal-1.13/init.m4:23: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl
5.188 +m4trace:/usr/share/aclocal-1.11/header.m4:12: -1- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
5.189 +m4trace:/usr/share/aclocal-1.11/header.m4:12: -1- AC_DEFUN([AM_CONFIG_HEADER], [AC_DIAGNOSE([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
5.190 +You should run autoupdate.])dnl
5.191 +AC_CONFIG_HEADERS($@)])
5.192 +m4trace:/usr/share/aclocal-1.11/init.m4:26: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.62])dnl
5.193 dnl Autoconf wants to disallow AM_ names. We explicitly allow
5.194 dnl the ones we care about.
5.195 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
5.196 @@ -266,40 +267,31 @@
5.197 # Define the identity of the package.
5.198 dnl Distinguish between old-style and new-style calls.
5.199 m4_ifval([$2],
5.200 -[AC_DIAGNOSE([obsolete],
5.201 - [$0: two- and three-arguments forms are deprecated.])
5.202 -m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
5.203 +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
5.204 AC_SUBST([PACKAGE], [$1])dnl
5.205 AC_SUBST([VERSION], [$2])],
5.206 [_AM_SET_OPTIONS([$1])dnl
5.207 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
5.208 -m4_if(
5.209 - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
5.210 - [ok:ok],,
5.211 +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
5.212 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
5.213 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
5.214 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
5.215
5.216 _AM_IF_OPTION([no-define],,
5.217 -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
5.218 - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
5.219 +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
5.220 + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
5.221
5.222 # Some tools Automake needs.
5.223 AC_REQUIRE([AM_SANITY_CHECK])dnl
5.224 AC_REQUIRE([AC_ARG_PROGRAM])dnl
5.225 -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
5.226 -AM_MISSING_PROG([AUTOCONF], [autoconf])
5.227 -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
5.228 -AM_MISSING_PROG([AUTOHEADER], [autoheader])
5.229 -AM_MISSING_PROG([MAKEINFO], [makeinfo])
5.230 +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
5.231 +AM_MISSING_PROG(AUTOCONF, autoconf)
5.232 +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
5.233 +AM_MISSING_PROG(AUTOHEADER, autoheader)
5.234 +AM_MISSING_PROG(MAKEINFO, makeinfo)
5.235 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
5.236 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
5.237 -AC_REQUIRE([AC_PROG_MKDIR_P])dnl
5.238 -# For better backward compatibility. To be removed once Automake 1.9.x
5.239 -# dies out for good. For more background, see:
5.240 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
5.241 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
5.242 -AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
5.243 +AC_REQUIRE([AM_PROG_MKDIR_P])dnl
5.244 # We need awk for the "check" target. The system "awk" is bad on
5.245 # some platforms.
5.246 AC_REQUIRE([AC_PROG_AWK])dnl
5.247 @@ -310,31 +302,27 @@
5.248 [_AM_PROG_TAR([v7])])])
5.249 _AM_IF_OPTION([no-dependencies],,
5.250 [AC_PROVIDE_IFELSE([AC_PROG_CC],
5.251 - [_AM_DEPENDENCIES([CC])],
5.252 - [m4_define([AC_PROG_CC],
5.253 - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
5.254 + [_AM_DEPENDENCIES(CC)],
5.255 + [define([AC_PROG_CC],
5.256 + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
5.257 AC_PROVIDE_IFELSE([AC_PROG_CXX],
5.258 - [_AM_DEPENDENCIES([CXX])],
5.259 - [m4_define([AC_PROG_CXX],
5.260 - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
5.261 + [_AM_DEPENDENCIES(CXX)],
5.262 + [define([AC_PROG_CXX],
5.263 + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
5.264 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
5.265 - [_AM_DEPENDENCIES([OBJC])],
5.266 - [m4_define([AC_PROG_OBJC],
5.267 - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
5.268 -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
5.269 - [_AM_DEPENDENCIES([OBJCXX])],
5.270 - [m4_define([AC_PROG_OBJCXX],
5.271 - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
5.272 + [_AM_DEPENDENCIES(OBJC)],
5.273 + [define([AC_PROG_OBJC],
5.274 + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
5.275 ])
5.276 -AC_REQUIRE([AM_SILENT_RULES])dnl
5.277 -dnl The testsuite driver may need to know about EXEEXT, so add the
5.278 -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
5.279 -dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
5.280 +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
5.281 +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
5.282 +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
5.283 +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
5.284 AC_CONFIG_COMMANDS_PRE(dnl
5.285 [m4_provide_if([_AM_COMPILER_EXEEXT],
5.286 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
5.287 ])
5.288 -m4trace:/usr/share/aclocal-1.13/init.m4:136: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
5.289 +m4trace:/usr/share/aclocal-1.11/init.m4:126: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
5.290 _am_arg=$1
5.291 _am_stamp_count=1
5.292 for _am_header in $config_headers :; do
5.293 @@ -346,7 +334,7 @@
5.294 esac
5.295 done
5.296 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
5.297 -m4trace:/usr/share/aclocal-1.13/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
5.298 +m4trace:/usr/share/aclocal-1.11/install-sh.m4:14: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
5.299 if test x"${install_sh}" != xset; then
5.300 case $am_aux_dir in
5.301 *\ * | *\ *)
5.302 @@ -355,8 +343,8 @@
5.303 install_sh="\${SHELL} $am_aux_dir/install-sh"
5.304 esac
5.305 fi
5.306 -AC_SUBST([install_sh])])
5.307 -m4trace:/usr/share/aclocal-1.13/lead-dot.m4:10: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
5.308 +AC_SUBST(install_sh)])
5.309 +m4trace:/usr/share/aclocal-1.11/lead-dot.m4:12: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
5.310 mkdir .tst 2>/dev/null
5.311 if test -d .tst; then
5.312 am__leading_dot=.
5.313 @@ -365,7 +353,7 @@
5.314 fi
5.315 rmdir .tst 2>/dev/null
5.316 AC_SUBST([am__leading_dot])])
5.317 -m4trace:/usr/share/aclocal-1.13/maintainer.m4:16: -1- AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]),
5.318 +m4trace:/usr/share/aclocal-1.11/maintainer.m4:19: -1- AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]),
5.319 [enable], [m4_define([am_maintainer_other], [disable])],
5.320 [disable], [m4_define([am_maintainer_other], [enable])],
5.321 [m4_define([am_maintainer_other], [enable])
5.322 @@ -373,18 +361,21 @@
5.323 AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
5.324 dnl maintainer-mode's default is 'disable' unless 'enable' is passed
5.325 AC_ARG_ENABLE([maintainer-mode],
5.326 - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
5.327 - am_maintainer_other[ make rules and dependencies not useful
5.328 - (and sometimes confusing) to the casual installer])],
5.329 - [USE_MAINTAINER_MODE=$enableval],
5.330 - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
5.331 +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
5.332 + (and sometimes confusing) to the casual installer],
5.333 + [USE_MAINTAINER_MODE=$enableval],
5.334 + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
5.335 AC_MSG_RESULT([$USE_MAINTAINER_MODE])
5.336 AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
5.337 MAINT=$MAINTAINER_MODE_TRUE
5.338 AC_SUBST([MAINT])dnl
5.339
5.340 ])
5.341 -m4trace:/usr/share/aclocal-1.13/make.m4:12: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
5.342 +m4trace:/usr/share/aclocal-1.11/maintainer.m4:39: -1- AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
5.343 +m4trace:/usr/share/aclocal-1.11/maintainer.m4:39: -1- AC_DEFUN([jm_MAINTAINER_MODE], [AC_DIAGNOSE([obsolete], [The macro `jm_MAINTAINER_MODE' is obsolete.
5.344 +You should run autoupdate.])dnl
5.345 +AM_MAINTAINER_MODE])
5.346 +m4trace:/usr/share/aclocal-1.11/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
5.347 cat > confinc << 'END'
5.348 am__doit:
5.349 @echo this is the am__doit target
5.350 @@ -397,7 +388,7 @@
5.351 _am_result=none
5.352 # First try GNU make style include.
5.353 echo "include confinc" > confmf
5.354 -# Ignore all kinds of additional output from 'make'.
5.355 +# Ignore all kinds of additional output from `make'.
5.356 case `$am_make -s -f confmf 2> /dev/null` in #(
5.357 *the\ am__doit\ target*)
5.358 am__include=include
5.359 @@ -421,10 +412,10 @@
5.360 AC_MSG_RESULT([$_am_result])
5.361 rm -f confinc confmf
5.362 ])
5.363 -m4trace:/usr/share/aclocal-1.13/missing.m4:11: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
5.364 +m4trace:/usr/share/aclocal-1.11/missing.m4:14: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
5.365 $1=${$1-"${am_missing_run}$2"}
5.366 AC_SUBST($1)])
5.367 -m4trace:/usr/share/aclocal-1.13/missing.m4:20: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
5.368 +m4trace:/usr/share/aclocal-1.11/missing.m4:24: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
5.369 AC_REQUIRE_AUX_FILE([missing])dnl
5.370 if test x"${MISSING+set}" != xset; then
5.371 case $am_aux_dir in
5.372 @@ -435,39 +426,41 @@
5.373 esac
5.374 fi
5.375 # Use eval to expand $SHELL
5.376 -if eval "$MISSING --is-lightweight"; then
5.377 - am_missing_run="$MISSING "
5.378 +if eval "$MISSING --run true"; then
5.379 + am_missing_run="$MISSING --run "
5.380 else
5.381 am_missing_run=
5.382 - AC_MSG_WARN(['missing' script is too old or missing])
5.383 + AC_MSG_WARN([`missing' script is too old or missing])
5.384 fi
5.385 ])
5.386 -m4trace:/usr/share/aclocal-1.13/obsolete.m4:11: -1- AC_DEFUN([AM_CONFIG_HEADER], [AC_DIAGNOSE([obsolete],
5.387 -['$0': this macro is obsolete.
5.388 -You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
5.389 -AC_CONFIG_HEADERS($@)])
5.390 -m4trace:/usr/share/aclocal-1.13/obsolete.m4:17: -1- AC_DEFUN([AM_PROG_CC_STDC], [AC_PROG_CC
5.391 -am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
5.392 -AC_DIAGNOSE([obsolete],
5.393 -['$0': this macro is obsolete.
5.394 -You should simply use the 'AC][_PROG_CC' macro instead.
5.395 -Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
5.396 -but upon 'ac_cv_prog_cc_stdc'.])])
5.397 -m4trace:/usr/share/aclocal-1.13/obsolete.m4:26: -1- AC_DEFUN([AM_C_PROTOTYPES], [AC_FATAL([automatic de-ANSI-fication support has been removed])])
5.398 -m4trace:/usr/share/aclocal-1.13/obsolete.m4:28: -1- AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
5.399 -m4trace:/usr/share/aclocal-1.13/obsolete.m4:28: -1- AC_DEFUN([fp_C_PROTOTYPES], [AC_DIAGNOSE([obsolete], [The macro `fp_C_PROTOTYPES' is obsolete.
5.400 -You should run autoupdate.])dnl
5.401 -AM_C_PROTOTYPES])
5.402 -m4trace:/usr/share/aclocal-1.13/options.m4:11: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
5.403 -m4trace:/usr/share/aclocal-1.13/options.m4:17: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
5.404 -m4trace:/usr/share/aclocal-1.13/options.m4:23: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
5.405 -m4trace:/usr/share/aclocal-1.13/options.m4:29: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
5.406 -m4trace:/usr/share/aclocal-1.13/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
5.407 +m4trace:/usr/share/aclocal-1.11/mkdirp.m4:14: -1- AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl
5.408 +AC_REQUIRE([AC_PROG_MKDIR_P])dnl
5.409 +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
5.410 +dnl while keeping a definition of mkdir_p for backward compatibility.
5.411 +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
5.412 +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
5.413 +dnl Makefile.ins that do not define MKDIR_P, so we do our own
5.414 +dnl adjustment using top_builddir (which is defined more often than
5.415 +dnl MKDIR_P).
5.416 +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
5.417 +case $mkdir_p in
5.418 + [[\\/$]]* | ?:[[\\/]]*) ;;
5.419 + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
5.420 +esac
5.421 +])
5.422 +m4trace:/usr/share/aclocal-1.11/options.m4:14: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
5.423 +m4trace:/usr/share/aclocal-1.11/options.m4:20: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
5.424 +m4trace:/usr/share/aclocal-1.11/options.m4:26: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
5.425 +m4trace:/usr/share/aclocal-1.11/options.m4:32: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
5.426 +m4trace:/usr/share/aclocal-1.11/runlog.m4:14: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
5.427 ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
5.428 ac_status=$?
5.429 echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
5.430 (exit $ac_status); }])
5.431 -m4trace:/usr/share/aclocal-1.13/sanity.m4:11: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
5.432 +m4trace:/usr/share/aclocal-1.11/sanity.m4:14: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
5.433 +# Just in case
5.434 +sleep 1
5.435 +echo timestamp > conftest.file
5.436 # Reject unsafe characters in $srcdir or the absolute working directory
5.437 # name. Accept space and tab only in the latter.
5.438 am_lf='
5.439 @@ -478,40 +471,32 @@
5.440 esac
5.441 case $srcdir in
5.442 *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
5.443 - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
5.444 + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
5.445 esac
5.446
5.447 -# Do 'set' in a subshell so we don't clobber the current shell's
5.448 +# Do `set' in a subshell so we don't clobber the current shell's
5.449 # arguments. Must try -L first in case configure is actually a
5.450 # symlink; some systems play weird games with the mod time of symlinks
5.451 # (eg FreeBSD returns the mod time of the symlink's containing
5.452 # directory).
5.453 if (
5.454 - am_has_slept=no
5.455 - for am_try in 1 2; do
5.456 - echo "timestamp, slept: $am_has_slept" > conftest.file
5.457 - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
5.458 - if test "$[*]" = "X"; then
5.459 - # -L didn't work.
5.460 - set X `ls -t "$srcdir/configure" conftest.file`
5.461 - fi
5.462 - if test "$[*]" != "X $srcdir/configure conftest.file" \
5.463 - && test "$[*]" != "X conftest.file $srcdir/configure"; then
5.464 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
5.465 + if test "$[*]" = "X"; then
5.466 + # -L didn't work.
5.467 + set X `ls -t "$srcdir/configure" conftest.file`
5.468 + fi
5.469 + rm -f conftest.file
5.470 + if test "$[*]" != "X $srcdir/configure conftest.file" \
5.471 + && test "$[*]" != "X conftest.file $srcdir/configure"; then
5.472
5.473 - # If neither matched, then we have a broken ls. This can happen
5.474 - # if, for instance, CONFIG_SHELL is bash and it inherits a
5.475 - # broken ls alias from the environment. This has actually
5.476 - # happened. Such a system could not be considered "sane".
5.477 - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
5.478 - alias in your environment])
5.479 - fi
5.480 - if test "$[2]" = conftest.file || test $am_try -eq 2; then
5.481 - break
5.482 - fi
5.483 - # Just in case.
5.484 - sleep 1
5.485 - am_has_slept=yes
5.486 - done
5.487 + # If neither matched, then we have a broken ls. This can happen
5.488 + # if, for instance, CONFIG_SHELL is bash and it inherits a
5.489 + # broken ls alias from the environment. This has actually
5.490 + # happened. Such a system could not be considered "sane".
5.491 + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
5.492 +alias in your environment])
5.493 + fi
5.494 +
5.495 test "$[2]" = conftest.file
5.496 )
5.497 then
5.498 @@ -521,38 +506,17 @@
5.499 AC_MSG_ERROR([newly created file is older than distributed files!
5.500 Check your system clock])
5.501 fi
5.502 -AC_MSG_RESULT([yes])
5.503 -# If we didn't sleep, we still need to ensure time stamps of config.status and
5.504 -# generated files are strictly newer.
5.505 -am_sleep_pid=
5.506 -if grep 'slept: no' conftest.file >/dev/null 2>&1; then
5.507 - ( sleep 1 ) &
5.508 - am_sleep_pid=$!
5.509 -fi
5.510 -AC_CONFIG_COMMANDS_PRE(
5.511 - [AC_MSG_CHECKING([that generated files are newer than configure])
5.512 - if test -n "$am_sleep_pid"; then
5.513 - # Hide warnings about reused PIDs.
5.514 - wait $am_sleep_pid 2>/dev/null
5.515 - fi
5.516 - AC_MSG_RESULT([done])])
5.517 -rm -f conftest.file
5.518 -])
5.519 -m4trace:/usr/share/aclocal-1.13/silent.m4:12: -1- AC_DEFUN([AM_SILENT_RULES], [AC_ARG_ENABLE([silent-rules], [dnl
5.520 -AS_HELP_STRING(
5.521 - [--enable-silent-rules],
5.522 - [less verbose build output (undo: "make V=1")])
5.523 -AS_HELP_STRING(
5.524 - [--disable-silent-rules],
5.525 - [verbose build output (undo: "make V=0")])dnl
5.526 -])
5.527 -case $enable_silent_rules in @%:@ (((
5.528 - yes) AM_DEFAULT_VERBOSITY=0;;
5.529 - no) AM_DEFAULT_VERBOSITY=1;;
5.530 - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
5.531 +AC_MSG_RESULT(yes)])
5.532 +m4trace:/usr/share/aclocal-1.11/silent.m4:14: -1- AC_DEFUN([AM_SILENT_RULES], [AC_ARG_ENABLE([silent-rules],
5.533 +[ --enable-silent-rules less verbose build output (undo: `make V=1')
5.534 + --disable-silent-rules verbose build output (undo: `make V=0')])
5.535 +case $enable_silent_rules in
5.536 +yes) AM_DEFAULT_VERBOSITY=0;;
5.537 +no) AM_DEFAULT_VERBOSITY=1;;
5.538 +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
5.539 esac
5.540 dnl
5.541 -dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
5.542 +dnl A few `make' implementations (e.g., NonStop OS and NextStep)
5.543 dnl do not support nested variable expansions.
5.544 dnl See automake bug#9928 and bug#10237.
5.545 am_make=${MAKE-make}
5.546 @@ -570,7 +534,7 @@
5.547 am_cv_make_support_nested_variables=no
5.548 fi])
5.549 if test $am_cv_make_support_nested_variables = yes; then
5.550 - dnl Using '$V' instead of '$(V)' breaks IRIX make.
5.551 + dnl Using `$V' instead of `$(V)' breaks IRIX make.
5.552 AM_V='$(V)'
5.553 AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
5.554 else
5.555 @@ -586,125 +550,88 @@
5.556 AC_SUBST([AM_BACKSLASH])dnl
5.557 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
5.558 ])
5.559 -m4trace:/usr/share/aclocal-1.13/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
5.560 -# Installed binaries are usually stripped using 'strip' when the user
5.561 -# run "make install-strip". However 'strip' might not be the right
5.562 +m4trace:/usr/share/aclocal-1.11/strip.m4:19: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
5.563 +# Installed binaries are usually stripped using `strip' when the user
5.564 +# run `make install-strip'. However `strip' might not be the right
5.565 # tool to use in cross-compilation environments, therefore Automake
5.566 -# will honor the 'STRIP' environment variable to overrule this program.
5.567 -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
5.568 +# will honor the `STRIP' environment variable to overrule this program.
5.569 +dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
5.570 if test "$cross_compiling" != no; then
5.571 AC_CHECK_TOOL([STRIP], [strip], :)
5.572 fi
5.573 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
5.574 AC_SUBST([INSTALL_STRIP_PROGRAM])])
5.575 -m4trace:/usr/share/aclocal-1.13/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
5.576 -m4trace:/usr/share/aclocal-1.13/substnot.m4:17: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
5.577 -m4trace:/usr/share/aclocal-1.13/tar.m4:23: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used
5.578 +m4trace:/usr/share/aclocal-1.11/substnot.m4:14: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
5.579 +m4trace:/usr/share/aclocal-1.11/substnot.m4:19: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
5.580 +m4trace:/usr/share/aclocal-1.11/tar.m4:24: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used
5.581 # in the wild :-( We should find a proper way to deprecate it ...
5.582 AC_SUBST([AMTAR], ['$${TAR-tar}'])
5.583 +m4_if([$1], [v7],
5.584 + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
5.585 + [m4_case([$1], [ustar],, [pax],,
5.586 + [m4_fatal([Unknown tar format])])
5.587 +AC_MSG_CHECKING([how to create a $1 tar archive])
5.588 +# Loop over all known methods to create a tar archive until one works.
5.589 +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
5.590 +_am_tools=${am_cv_prog_tar_$1-$_am_tools}
5.591 +# Do not fold the above two line into one, because Tru64 sh and
5.592 +# Solaris sh will not grok spaces in the rhs of `-'.
5.593 +for _am_tool in $_am_tools
5.594 +do
5.595 + case $_am_tool in
5.596 + gnutar)
5.597 + for _am_tar in tar gnutar gtar;
5.598 + do
5.599 + AM_RUN_LOG([$_am_tar --version]) && break
5.600 + done
5.601 + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
5.602 + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
5.603 + am__untar="$_am_tar -xf -"
5.604 + ;;
5.605 + plaintar)
5.606 + # Must skip GNU tar: if it does not support --format= it doesn't create
5.607 + # ustar tarball either.
5.608 + (tar --version) >/dev/null 2>&1 && continue
5.609 + am__tar='tar chf - "$$tardir"'
5.610 + am__tar_='tar chf - "$tardir"'
5.611 + am__untar='tar xf -'
5.612 + ;;
5.613 + pax)
5.614 + am__tar='pax -L -x $1 -w "$$tardir"'
5.615 + am__tar_='pax -L -x $1 -w "$tardir"'
5.616 + am__untar='pax -r'
5.617 + ;;
5.618 + cpio)
5.619 + am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
5.620 + am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
5.621 + am__untar='cpio -i -H $1 -d'
5.622 + ;;
5.623 + none)
5.624 + am__tar=false
5.625 + am__tar_=false
5.626 + am__untar=false
5.627 + ;;
5.628 + esac
5.629
5.630 -# We'll loop over all known methods to create a tar archive until one works.
5.631 -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
5.632 + # If the value was cached, stop now. We just wanted to have am__tar
5.633 + # and am__untar set.
5.634 + test -n "${am_cv_prog_tar_$1}" && break
5.635
5.636 -m4_if([$1], [v7],
5.637 - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
5.638 + # tar/untar a dummy directory, and stop if the command works
5.639 + rm -rf conftest.dir
5.640 + mkdir conftest.dir
5.641 + echo GrepMe > conftest.dir/file
5.642 + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
5.643 + rm -rf conftest.dir
5.644 + if test -s conftest.tar; then
5.645 + AM_RUN_LOG([$am__untar <conftest.tar])
5.646 + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
5.647 + fi
5.648 +done
5.649 +rm -rf conftest.dir
5.650
5.651 - [m4_case([$1],
5.652 - [ustar],
5.653 - [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
5.654 - # There is notably a 21 bits limit for the UID and the GID. In fact,
5.655 - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
5.656 - # and bug#13588).
5.657 - am_max_uid=2097151 # 2^21 - 1
5.658 - am_max_gid=$am_max_uid
5.659 - # The $UID and $GID variables are not portable, so we need to resort
5.660 - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
5.661 - # below are definitely unexpected, so allow the users to see them
5.662 - # (that is, avoid stderr redirection).
5.663 - am_uid=`id -u || echo unknown`
5.664 - am_gid=`id -g || echo unknown`
5.665 - AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
5.666 - if test $am_uid -le $am_max_uid; then
5.667 - AC_MSG_RESULT([yes])
5.668 - else
5.669 - AC_MSG_RESULT([no])
5.670 - _am_tools=none
5.671 - fi
5.672 - AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
5.673 - if test $am_gid -le $am_max_gid; then
5.674 - AC_MSG_RESULT([yes])
5.675 - else
5.676 - AC_MSG_RESULT([no])
5.677 - _am_tools=none
5.678 - fi],
5.679 -
5.680 - [pax],
5.681 - [],
5.682 -
5.683 - [m4_fatal([Unknown tar format])])
5.684 -
5.685 - AC_MSG_CHECKING([how to create a $1 tar archive])
5.686 -
5.687 - # Go ahead even if we have the value already cached. We do so because we
5.688 - # need to set the values for the 'am__tar' and 'am__untar' variables.
5.689 - _am_tools=${am_cv_prog_tar_$1-$_am_tools}
5.690 -
5.691 - for _am_tool in $_am_tools; do
5.692 - case $_am_tool in
5.693 - gnutar)
5.694 - for _am_tar in tar gnutar gtar; do
5.695 - AM_RUN_LOG([$_am_tar --version]) && break
5.696 - done
5.697 - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
5.698 - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
5.699 - am__untar="$_am_tar -xf -"
5.700 - ;;
5.701 - plaintar)
5.702 - # Must skip GNU tar: if it does not support --format= it doesn't create
5.703 - # ustar tarball either.
5.704 - (tar --version) >/dev/null 2>&1 && continue
5.705 - am__tar='tar chf - "$$tardir"'
5.706 - am__tar_='tar chf - "$tardir"'
5.707 - am__untar='tar xf -'
5.708 - ;;
5.709 - pax)
5.710 - am__tar='pax -L -x $1 -w "$$tardir"'
5.711 - am__tar_='pax -L -x $1 -w "$tardir"'
5.712 - am__untar='pax -r'
5.713 - ;;
5.714 - cpio)
5.715 - am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
5.716 - am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
5.717 - am__untar='cpio -i -H $1 -d'
5.718 - ;;
5.719 - none)
5.720 - am__tar=false
5.721 - am__tar_=false
5.722 - am__untar=false
5.723 - ;;
5.724 - esac
5.725 -
5.726 - # If the value was cached, stop now. We just wanted to have am__tar
5.727 - # and am__untar set.
5.728 - test -n "${am_cv_prog_tar_$1}" && break
5.729 -
5.730 - # tar/untar a dummy directory, and stop if the command works.
5.731 - rm -rf conftest.dir
5.732 - mkdir conftest.dir
5.733 - echo GrepMe > conftest.dir/file
5.734 - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
5.735 - rm -rf conftest.dir
5.736 - if test -s conftest.tar; then
5.737 - AM_RUN_LOG([$am__untar <conftest.tar])
5.738 - AM_RUN_LOG([cat conftest.dir/file])
5.739 - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
5.740 - fi
5.741 - done
5.742 - rm -rf conftest.dir
5.743 -
5.744 - AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
5.745 - AC_MSG_RESULT([$am_cv_prog_tar_$1])])
5.746 -
5.747 +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
5.748 +AC_MSG_RESULT([$am_cv_prog_tar_$1])])
5.749 AC_SUBST([am__tar])
5.750 AC_SUBST([am__untar])
5.751 ])
5.752 @@ -760,14 +687,14 @@
5.753 m4trace:configure.ac:37: -1- m4_pattern_allow([^host_alias$])
5.754 m4trace:configure.ac:37: -1- m4_pattern_allow([^target_alias$])
5.755 m4trace:configure.ac:38: -1- AM_CONFIG_HEADER([config.h])
5.756 -m4trace:configure.ac:38: -1- _m4_warn([obsolete], ['AM_CONFIG_HEADER': this macro is obsolete.
5.757 -You should use the 'AC_CONFIG_HEADERS' macro instead.], [/usr/share/aclocal-1.13/obsolete.m4:11: AM_CONFIG_HEADER is expanded from...
5.758 +m4trace:configure.ac:38: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
5.759 +You should run autoupdate.], [/usr/share/aclocal-1.11/header.m4:12: AM_CONFIG_HEADER is expanded from...
5.760 configure.ac:38: the top level])
5.761 m4trace:configure.ac:39: -1- AM_INIT_AUTOMAKE
5.762 m4trace:configure.ac:39: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
5.763 m4trace:configure.ac:39: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
5.764 -m4trace:configure.ac:39: -1- AM_AUTOMAKE_VERSION([1.13.3])
5.765 -m4trace:configure.ac:39: -1- _AM_AUTOCONF_VERSION([2.69])
5.766 +m4trace:configure.ac:39: -1- AM_AUTOMAKE_VERSION([1.11.3])
5.767 +m4trace:configure.ac:39: -1- _AM_AUTOCONF_VERSION([2.68])
5.768 m4trace:configure.ac:39: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
5.769 m4trace:configure.ac:39: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
5.770 m4trace:configure.ac:39: -1- m4_pattern_allow([^INSTALL_DATA$])
5.771 @@ -777,8 +704,8 @@
5.772 m4trace:configure.ac:39: -1- _AM_SET_OPTIONS([])
5.773 m4trace:configure.ac:39: -1- m4_pattern_allow([^PACKAGE$])
5.774 m4trace:configure.ac:39: -1- m4_pattern_allow([^VERSION$])
5.775 -m4trace:configure.ac:39: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
5.776 - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])
5.777 +m4trace:configure.ac:39: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
5.778 + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
5.779 m4trace:configure.ac:39: -2- _AM_MANGLE_OPTION([no-define])
5.780 m4trace:configure.ac:39: -1- m4_pattern_allow([^PACKAGE$])
5.781 m4trace:configure.ac:39: -1- m4_pattern_allow([^VERSION$])
5.782 @@ -800,6 +727,7 @@
5.783 m4trace:configure.ac:39: -1- AM_PROG_INSTALL_STRIP
5.784 m4trace:configure.ac:39: -1- m4_pattern_allow([^STRIP$])
5.785 m4trace:configure.ac:39: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
5.786 +m4trace:configure.ac:39: -1- AM_PROG_MKDIR_P
5.787 m4trace:configure.ac:39: -1- m4_pattern_allow([^MKDIR_P$])
5.788 m4trace:configure.ac:39: -1- m4_pattern_allow([^mkdir_p$])
5.789 m4trace:configure.ac:39: -1- m4_pattern_allow([^AWK$])
5.790 @@ -816,33 +744,21 @@
5.791 m4trace:configure.ac:39: -1- m4_pattern_allow([^am__tar$])
5.792 m4trace:configure.ac:39: -1- m4_pattern_allow([^am__untar$])
5.793 m4trace:configure.ac:39: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
5.794 - [_AM_DEPENDENCIES([CC])],
5.795 - [m4_define([AC_PROG_CC],
5.796 - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
5.797 + [_AM_DEPENDENCIES(CC)],
5.798 + [define([AC_PROG_CC],
5.799 + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
5.800 AC_PROVIDE_IFELSE([AC_PROG_CXX],
5.801 - [_AM_DEPENDENCIES([CXX])],
5.802 - [m4_define([AC_PROG_CXX],
5.803 - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
5.804 + [_AM_DEPENDENCIES(CXX)],
5.805 + [define([AC_PROG_CXX],
5.806 + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
5.807 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
5.808 - [_AM_DEPENDENCIES([OBJC])],
5.809 - [m4_define([AC_PROG_OBJC],
5.810 - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
5.811 -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
5.812 - [_AM_DEPENDENCIES([OBJCXX])],
5.813 - [m4_define([AC_PROG_OBJCXX],
5.814 - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
5.815 + [_AM_DEPENDENCIES(OBJC)],
5.816 + [define([AC_PROG_OBJC],
5.817 + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
5.818 ])
5.819 m4trace:configure.ac:39: -2- _AM_MANGLE_OPTION([no-dependencies])
5.820 -m4trace:configure.ac:39: -1- AM_SILENT_RULES
5.821 -m4trace:configure.ac:39: -1- m4_pattern_allow([^AM_V$])
5.822 -m4trace:configure.ac:39: -1- AM_SUBST_NOTMAKE([AM_V])
5.823 -m4trace:configure.ac:39: -1- _AM_SUBST_NOTMAKE([AM_V])
5.824 -m4trace:configure.ac:39: -1- m4_pattern_allow([^AM_DEFAULT_V$])
5.825 -m4trace:configure.ac:39: -1- AM_SUBST_NOTMAKE([AM_DEFAULT_V])
5.826 -m4trace:configure.ac:39: -1- _AM_SUBST_NOTMAKE([AM_DEFAULT_V])
5.827 -m4trace:configure.ac:39: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$])
5.828 -m4trace:configure.ac:39: -1- m4_pattern_allow([^AM_BACKSLASH$])
5.829 -m4trace:configure.ac:39: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
5.830 +m4trace:configure.ac:39: -1- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])
5.831 +m4trace:configure.ac:39: -2- _AM_MANGLE_OPTION([silent-rules])
5.832 m4trace:configure.ac:41: -1- m4_pattern_allow([^CC$])
5.833 m4trace:configure.ac:41: -1- m4_pattern_allow([^CFLAGS$])
5.834 m4trace:configure.ac:41: -1- m4_pattern_allow([^LDFLAGS$])
6.1 --- a/autom4te.cache/traces.1 Fri Mar 28 16:21:31 2014 +0000
6.2 +++ b/autom4te.cache/traces.1 Sat Mar 29 13:10:05 2014 +0000
6.3 @@ -146,13 +146,13 @@
6.4 m4trace:configure.ac:37: -1- AC_SUBST([target_alias])
6.5 m4trace:configure.ac:37: -1- AC_SUBST_TRACE([target_alias])
6.6 m4trace:configure.ac:37: -1- m4_pattern_allow([^target_alias$])
6.7 -m4trace:configure.ac:38: -1- _m4_warn([obsolete], ['AM_CONFIG_HEADER': this macro is obsolete.
6.8 -You should use the 'AC_CONFIG_HEADERS' macro instead.], [aclocal.m4:734: AM_CONFIG_HEADER is expanded from...
6.9 +m4trace:configure.ac:38: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
6.10 +You should run autoupdate.], [aclocal.m4:429: AM_CONFIG_HEADER is expanded from...
6.11 configure.ac:38: the top level])
6.12 m4trace:configure.ac:38: -1- AC_CONFIG_HEADERS([config.h])
6.13 m4trace:configure.ac:39: -1- AM_INIT_AUTOMAKE
6.14 m4trace:configure.ac:39: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
6.15 -m4trace:configure.ac:39: -1- AM_AUTOMAKE_VERSION([1.13.3])
6.16 +m4trace:configure.ac:39: -1- AM_AUTOMAKE_VERSION([1.11.3])
6.17 m4trace:configure.ac:39: -1- AC_REQUIRE_AUX_FILE([install-sh])
6.18 m4trace:configure.ac:39: -1- AC_SUBST([INSTALL_PROGRAM])
6.19 m4trace:configure.ac:39: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
6.20 @@ -213,7 +213,7 @@
6.21 m4trace:configure.ac:39: -1- AC_SUBST([MKDIR_P])
6.22 m4trace:configure.ac:39: -1- AC_SUBST_TRACE([MKDIR_P])
6.23 m4trace:configure.ac:39: -1- m4_pattern_allow([^MKDIR_P$])
6.24 -m4trace:configure.ac:39: -1- AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
6.25 +m4trace:configure.ac:39: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"])
6.26 m4trace:configure.ac:39: -1- AC_SUBST_TRACE([mkdir_p])
6.27 m4trace:configure.ac:39: -1- m4_pattern_allow([^mkdir_p$])
6.28 m4trace:configure.ac:39: -1- AC_SUBST([AWK])
6.29 @@ -234,22 +234,6 @@
6.30 m4trace:configure.ac:39: -1- AC_SUBST([am__untar])
6.31 m4trace:configure.ac:39: -1- AC_SUBST_TRACE([am__untar])
6.32 m4trace:configure.ac:39: -1- m4_pattern_allow([^am__untar$])
6.33 -m4trace:configure.ac:39: -1- AM_SILENT_RULES
6.34 -m4trace:configure.ac:39: -1- AC_SUBST([AM_V])
6.35 -m4trace:configure.ac:39: -1- AC_SUBST_TRACE([AM_V])
6.36 -m4trace:configure.ac:39: -1- m4_pattern_allow([^AM_V$])
6.37 -m4trace:configure.ac:39: -1- _AM_SUBST_NOTMAKE([AM_V])
6.38 -m4trace:configure.ac:39: -1- AC_SUBST([AM_DEFAULT_V])
6.39 -m4trace:configure.ac:39: -1- AC_SUBST_TRACE([AM_DEFAULT_V])
6.40 -m4trace:configure.ac:39: -1- m4_pattern_allow([^AM_DEFAULT_V$])
6.41 -m4trace:configure.ac:39: -1- _AM_SUBST_NOTMAKE([AM_DEFAULT_V])
6.42 -m4trace:configure.ac:39: -1- AC_SUBST([AM_DEFAULT_VERBOSITY])
6.43 -m4trace:configure.ac:39: -1- AC_SUBST_TRACE([AM_DEFAULT_VERBOSITY])
6.44 -m4trace:configure.ac:39: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$])
6.45 -m4trace:configure.ac:39: -1- AC_SUBST([AM_BACKSLASH])
6.46 -m4trace:configure.ac:39: -1- AC_SUBST_TRACE([AM_BACKSLASH])
6.47 -m4trace:configure.ac:39: -1- m4_pattern_allow([^AM_BACKSLASH$])
6.48 -m4trace:configure.ac:39: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
6.49 m4trace:configure.ac:41: -1- AC_SUBST([CC])
6.50 m4trace:configure.ac:41: -1- AC_SUBST_TRACE([CC])
6.51 m4trace:configure.ac:41: -1- m4_pattern_allow([^CC$])
7.1 --- a/configure Fri Mar 28 16:21:31 2014 +0000
7.2 +++ b/configure Sat Mar 29 13:10:05 2014 +0000
7.3 @@ -1,11 +1,13 @@
7.4 #! /bin/sh
7.5 # Guess values for system-dependent variables and create Makefiles.
7.6 -# Generated by GNU Autoconf 2.69 for ltplib 0.1.
7.7 +# Generated by GNU Autoconf 2.68 for ltplib 0.1.
7.8 #
7.9 # Report bugs to <EMAIL PROTECTED>.
7.10 #
7.11 #
7.12 -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
7.13 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
7.14 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
7.15 +# Foundation, Inc.
7.16 #
7.17 #
7.18 # This configure script is free software; the Free Software Foundation
7.19 @@ -134,31 +136,6 @@
7.20 # CDPATH.
7.21 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
7.22
7.23 -# Use a proper internal environment variable to ensure we don't fall
7.24 - # into an infinite loop, continuously re-executing ourselves.
7.25 - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
7.26 - _as_can_reexec=no; export _as_can_reexec;
7.27 - # We cannot yet assume a decent shell, so we have to provide a
7.28 -# neutralization value for shells without unset; and this also
7.29 -# works around shells that cannot unset nonexistent variables.
7.30 -# Preserve -v and -x to the replacement shell.
7.31 -BASH_ENV=/dev/null
7.32 -ENV=/dev/null
7.33 -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
7.34 -case $- in # ((((
7.35 - *v*x* | *x*v* ) as_opts=-vx ;;
7.36 - *v* ) as_opts=-v ;;
7.37 - *x* ) as_opts=-x ;;
7.38 - * ) as_opts= ;;
7.39 -esac
7.40 -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
7.41 -# Admittedly, this is quite paranoid, since all the known shells bail
7.42 -# out after a failed `exec'.
7.43 -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
7.44 -as_fn_exit 255
7.45 - fi
7.46 - # We don't want this to propagate to other subprocesses.
7.47 - { _as_can_reexec=; unset _as_can_reexec;}
7.48 if test "x$CONFIG_SHELL" = x; then
7.49 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
7.50 emulate sh
7.51 @@ -192,8 +169,7 @@
7.52 else
7.53 exitcode=1; echo positional parameters were not saved.
7.54 fi
7.55 -test x\$exitcode = x0 || exit 1
7.56 -test -x / || exit 1"
7.57 +test x\$exitcode = x0 || exit 1"
7.58 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
7.59 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
7.60 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
7.61 @@ -237,25 +213,21 @@
7.62
7.63
7.64 if test "x$CONFIG_SHELL" != x; then :
7.65 - export CONFIG_SHELL
7.66 - # We cannot yet assume a decent shell, so we have to provide a
7.67 -# neutralization value for shells without unset; and this also
7.68 -# works around shells that cannot unset nonexistent variables.
7.69 -# Preserve -v and -x to the replacement shell.
7.70 -BASH_ENV=/dev/null
7.71 -ENV=/dev/null
7.72 -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
7.73 -case $- in # ((((
7.74 - *v*x* | *x*v* ) as_opts=-vx ;;
7.75 - *v* ) as_opts=-v ;;
7.76 - *x* ) as_opts=-x ;;
7.77 - * ) as_opts= ;;
7.78 -esac
7.79 -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
7.80 -# Admittedly, this is quite paranoid, since all the known shells bail
7.81 -# out after a failed `exec'.
7.82 -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
7.83 -exit 255
7.84 + # We cannot yet assume a decent shell, so we have to provide a
7.85 + # neutralization value for shells without unset; and this also
7.86 + # works around shells that cannot unset nonexistent variables.
7.87 + # Preserve -v and -x to the replacement shell.
7.88 + BASH_ENV=/dev/null
7.89 + ENV=/dev/null
7.90 + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
7.91 + export CONFIG_SHELL
7.92 + case $- in # ((((
7.93 + *v*x* | *x*v* ) as_opts=-vx ;;
7.94 + *v* ) as_opts=-v ;;
7.95 + *x* ) as_opts=-x ;;
7.96 + * ) as_opts= ;;
7.97 + esac
7.98 + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
7.99 fi
7.100
7.101 if test x$as_have_required = xno; then :
7.102 @@ -358,14 +330,6 @@
7.103
7.104
7.105 } # as_fn_mkdir_p
7.106 -
7.107 -# as_fn_executable_p FILE
7.108 -# -----------------------
7.109 -# Test if FILE is an executable regular file.
7.110 -as_fn_executable_p ()
7.111 -{
7.112 - test -f "$1" && test -x "$1"
7.113 -} # as_fn_executable_p
7.114 # as_fn_append VAR VALUE
7.115 # ----------------------
7.116 # Append the text in VALUE to the end of the definition contained in VAR. Take
7.117 @@ -487,10 +451,6 @@
7.118 chmod +x "$as_me.lineno" ||
7.119 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
7.120
7.121 - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
7.122 - # already done that, so ensure we don't try to do so again and fall
7.123 - # in an infinite loop. This has already happened in practice.
7.124 - _as_can_reexec=no; export _as_can_reexec
7.125 # Don't try to exec as it changes $[0], causing all sort of problems
7.126 # (the dirname of $[0] is not the place where we might find the
7.127 # original and so on. Autoconf is especially sensitive to this).
7.128 @@ -525,16 +485,16 @@
7.129 # ... but there are two gotchas:
7.130 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
7.131 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
7.132 - # In both cases, we have to default to `cp -pR'.
7.133 + # In both cases, we have to default to `cp -p'.
7.134 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
7.135 - as_ln_s='cp -pR'
7.136 + as_ln_s='cp -p'
7.137 elif ln conf$$.file conf$$ 2>/dev/null; then
7.138 as_ln_s=ln
7.139 else
7.140 - as_ln_s='cp -pR'
7.141 + as_ln_s='cp -p'
7.142 fi
7.143 else
7.144 - as_ln_s='cp -pR'
7.145 + as_ln_s='cp -p'
7.146 fi
7.147 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
7.148 rmdir conf$$.dir 2>/dev/null
7.149 @@ -546,8 +506,28 @@
7.150 as_mkdir_p=false
7.151 fi
7.152
7.153 -as_test_x='test -x'
7.154 -as_executable_p=as_fn_executable_p
7.155 +if test -x / >/dev/null 2>&1; then
7.156 + as_test_x='test -x'
7.157 +else
7.158 + if ls -dL / >/dev/null 2>&1; then
7.159 + as_ls_L_option=L
7.160 + else
7.161 + as_ls_L_option=
7.162 + fi
7.163 + as_test_x='
7.164 + eval sh -c '\''
7.165 + if test -d "$1"; then
7.166 + test -d "$1/.";
7.167 + else
7.168 + case $1 in #(
7.169 + -*)set "./$1";;
7.170 + esac;
7.171 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
7.172 + ???[sx]*):;;*)false;;esac;fi
7.173 + '\'' sh
7.174 + '
7.175 +fi
7.176 +as_executable_p=$as_test_x
7.177
7.178 # Sed expression to map a string onto a valid CPP name.
7.179 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
7.180 @@ -625,10 +605,6 @@
7.181 LDFLAGS
7.182 CFLAGS
7.183 CC
7.184 -AM_BACKSLASH
7.185 -AM_DEFAULT_VERBOSITY
7.186 -AM_DEFAULT_V
7.187 -AM_V
7.188 am__untar
7.189 am__tar
7.190 AMTAR
7.191 @@ -693,7 +669,6 @@
7.192 ac_subst_files=''
7.193 ac_user_opts='
7.194 enable_option_checking
7.195 -enable_silent_rules
7.196 enable_dependency_tracking
7.197 enable_maintainer_mode
7.198 '
7.199 @@ -1163,6 +1138,8 @@
7.200 if test "x$host_alias" != x; then
7.201 if test "x$build_alias" = x; then
7.202 cross_compiling=maybe
7.203 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
7.204 + If a cross compiler is detected then cross compile mode will be used" >&2
7.205 elif test "x$build_alias" != "x$host_alias"; then
7.206 cross_compiling=yes
7.207 fi
7.208 @@ -1326,15 +1303,10 @@
7.209 --disable-option-checking ignore unrecognized --enable/--with options
7.210 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
7.211 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
7.212 - --enable-silent-rules less verbose build output (undo: "make V=1")
7.213 - --disable-silent-rules verbose build output (undo: "make V=0")
7.214 - --enable-dependency-tracking
7.215 - do not reject slow dependency extractors
7.216 - --disable-dependency-tracking
7.217 - speeds up one-time build
7.218 - --enable-maintainer-mode
7.219 - enable make rules and dependencies not useful (and
7.220 - sometimes confusing) to the casual installer
7.221 + --disable-dependency-tracking speeds up one-time build
7.222 + --enable-dependency-tracking do not reject slow dependency extractors
7.223 + --enable-maintainer-mode enable make rules and dependencies not useful
7.224 + (and sometimes confusing) to the casual installer
7.225
7.226 Some influential environment variables:
7.227 CC C compiler command
7.228 @@ -1414,9 +1386,9 @@
7.229 if $ac_init_version; then
7.230 cat <<\_ACEOF
7.231 ltplib configure 0.1
7.232 -generated by GNU Autoconf 2.69
7.233 -
7.234 -Copyright (C) 2012 Free Software Foundation, Inc.
7.235 +generated by GNU Autoconf 2.68
7.236 +
7.237 +Copyright (C) 2010 Free Software Foundation, Inc.
7.238 This configure script is free software; the Free Software Foundation
7.239 gives unlimited permission to copy, distribute and modify it.
7.240 _ACEOF
7.241 @@ -1507,7 +1479,7 @@
7.242 running configure, to aid debugging if configure makes a mistake.
7.243
7.244 It was created by ltplib $as_me 0.1, which was
7.245 -generated by GNU Autoconf 2.69. Invocation command line was
7.246 +generated by GNU Autoconf 2.68. Invocation command line was
7.247
7.248 $ $0 $@
7.249
7.250 @@ -1856,7 +1828,7 @@
7.251
7.252 ac_config_headers="$ac_config_headers config.h"
7.253
7.254 -am__api_version='1.13'
7.255 +am__api_version='1.11'
7.256
7.257 ac_aux_dir=
7.258 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
7.259 @@ -1924,7 +1896,7 @@
7.260 # by default.
7.261 for ac_prog in ginstall scoinst install; do
7.262 for ac_exec_ext in '' $ac_executable_extensions; do
7.263 - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
7.264 + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
7.265 if test $ac_prog = install &&
7.266 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
7.267 # AIX install. It has an incompatible calling convention.
7.268 @@ -1982,6 +1954,9 @@
7.269
7.270 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
7.271 $as_echo_n "checking whether build environment is sane... " >&6; }
7.272 +# Just in case
7.273 +sleep 1
7.274 +echo timestamp > conftest.file
7.275 # Reject unsafe characters in $srcdir or the absolute working directory
7.276 # name. Accept space and tab only in the latter.
7.277 am_lf='
7.278 @@ -1992,40 +1967,32 @@
7.279 esac
7.280 case $srcdir in
7.281 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
7.282 - as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
7.283 + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
7.284 esac
7.285
7.286 -# Do 'set' in a subshell so we don't clobber the current shell's
7.287 +# Do `set' in a subshell so we don't clobber the current shell's
7.288 # arguments. Must try -L first in case configure is actually a
7.289 # symlink; some systems play weird games with the mod time of symlinks
7.290 # (eg FreeBSD returns the mod time of the symlink's containing
7.291 # directory).
7.292 if (
7.293 - am_has_slept=no
7.294 - for am_try in 1 2; do
7.295 - echo "timestamp, slept: $am_has_slept" > conftest.file
7.296 - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
7.297 - if test "$*" = "X"; then
7.298 - # -L didn't work.
7.299 - set X `ls -t "$srcdir/configure" conftest.file`
7.300 - fi
7.301 - if test "$*" != "X $srcdir/configure conftest.file" \
7.302 - && test "$*" != "X conftest.file $srcdir/configure"; then
7.303 -
7.304 - # If neither matched, then we have a broken ls. This can happen
7.305 - # if, for instance, CONFIG_SHELL is bash and it inherits a
7.306 - # broken ls alias from the environment. This has actually
7.307 - # happened. Such a system could not be considered "sane".
7.308 - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
7.309 - alias in your environment" "$LINENO" 5
7.310 - fi
7.311 - if test "$2" = conftest.file || test $am_try -eq 2; then
7.312 - break
7.313 - fi
7.314 - # Just in case.
7.315 - sleep 1
7.316 - am_has_slept=yes
7.317 - done
7.318 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
7.319 + if test "$*" = "X"; then
7.320 + # -L didn't work.
7.321 + set X `ls -t "$srcdir/configure" conftest.file`
7.322 + fi
7.323 + rm -f conftest.file
7.324 + if test "$*" != "X $srcdir/configure conftest.file" \
7.325 + && test "$*" != "X conftest.file $srcdir/configure"; then
7.326 +
7.327 + # If neither matched, then we have a broken ls. This can happen
7.328 + # if, for instance, CONFIG_SHELL is bash and it inherits a
7.329 + # broken ls alias from the environment. This has actually
7.330 + # happened. Such a system could not be considered "sane".
7.331 + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
7.332 +alias in your environment" "$LINENO" 5
7.333 + fi
7.334 +
7.335 test "$2" = conftest.file
7.336 )
7.337 then
7.338 @@ -2037,16 +2004,6 @@
7.339 fi
7.340 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7.341 $as_echo "yes" >&6; }
7.342 -# If we didn't sleep, we still need to ensure time stamps of config.status and
7.343 -# generated files are strictly newer.
7.344 -am_sleep_pid=
7.345 -if grep 'slept: no' conftest.file >/dev/null 2>&1; then
7.346 - ( sleep 1 ) &
7.347 - am_sleep_pid=$!
7.348 -fi
7.349 -
7.350 -rm -f conftest.file
7.351 -
7.352 test "$program_prefix" != NONE &&
7.353 program_transform_name="s&^&$program_prefix&;$program_transform_name"
7.354 # Use a double $ so make ignores it.
7.355 @@ -2069,12 +2026,12 @@
7.356 esac
7.357 fi
7.358 # Use eval to expand $SHELL
7.359 -if eval "$MISSING --is-lightweight"; then
7.360 - am_missing_run="$MISSING "
7.361 +if eval "$MISSING --run true"; then
7.362 + am_missing_run="$MISSING --run "
7.363 else
7.364 am_missing_run=
7.365 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
7.366 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
7.367 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
7.368 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
7.369 fi
7.370
7.371 if test x"${install_sh}" != xset; then
7.372 @@ -2086,10 +2043,10 @@
7.373 esac
7.374 fi
7.375
7.376 -# Installed binaries are usually stripped using 'strip' when the user
7.377 -# run "make install-strip". However 'strip' might not be the right
7.378 +# Installed binaries are usually stripped using `strip' when the user
7.379 +# run `make install-strip'. However `strip' might not be the right
7.380 # tool to use in cross-compilation environments, therefore Automake
7.381 -# will honor the 'STRIP' environment variable to overrule this program.
7.382 +# will honor the `STRIP' environment variable to overrule this program.
7.383 if test "$cross_compiling" != no; then
7.384 if test -n "$ac_tool_prefix"; then
7.385 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
7.386 @@ -2108,7 +2065,7 @@
7.387 IFS=$as_save_IFS
7.388 test -z "$as_dir" && as_dir=.
7.389 for ac_exec_ext in '' $ac_executable_extensions; do
7.390 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.391 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.392 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
7.393 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7.394 break 2
7.395 @@ -2148,7 +2105,7 @@
7.396 IFS=$as_save_IFS
7.397 test -z "$as_dir" && as_dir=.
7.398 for ac_exec_ext in '' $ac_executable_extensions; do
7.399 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.400 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.401 ac_cv_prog_ac_ct_STRIP="strip"
7.402 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7.403 break 2
7.404 @@ -2199,7 +2156,7 @@
7.405 test -z "$as_dir" && as_dir=.
7.406 for ac_prog in mkdir gmkdir; do
7.407 for ac_exec_ext in '' $ac_executable_extensions; do
7.408 - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
7.409 + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
7.410 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
7.411 'mkdir (GNU coreutils) '* | \
7.412 'mkdir (coreutils) '* | \
7.413 @@ -2228,6 +2185,12 @@
7.414 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
7.415 $as_echo "$MKDIR_P" >&6; }
7.416
7.417 +mkdir_p="$MKDIR_P"
7.418 +case $mkdir_p in
7.419 + [\\/$]* | ?:[\\/]*) ;;
7.420 + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
7.421 +esac
7.422 +
7.423 for ac_prog in gawk mawk nawk awk
7.424 do
7.425 # Extract the first word of "$ac_prog", so it can be a program name with args.
7.426 @@ -2246,7 +2209,7 @@
7.427 IFS=$as_save_IFS
7.428 test -z "$as_dir" && as_dir=.
7.429 for ac_exec_ext in '' $ac_executable_extensions; do
7.430 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.431 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.432 ac_cv_prog_AWK="$ac_prog"
7.433 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7.434 break 2
7.435 @@ -2310,45 +2273,6 @@
7.436 fi
7.437 rmdir .tst 2>/dev/null
7.438
7.439 -# Check whether --enable-silent-rules was given.
7.440 -if test "${enable_silent_rules+set}" = set; then :
7.441 - enableval=$enable_silent_rules;
7.442 -fi
7.443 -
7.444 -case $enable_silent_rules in # (((
7.445 - yes) AM_DEFAULT_VERBOSITY=0;;
7.446 - no) AM_DEFAULT_VERBOSITY=1;;
7.447 - *) AM_DEFAULT_VERBOSITY=1;;
7.448 -esac
7.449 -am_make=${MAKE-make}
7.450 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
7.451 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
7.452 -if ${am_cv_make_support_nested_variables+:} false; then :
7.453 - $as_echo_n "(cached) " >&6
7.454 -else
7.455 - if $as_echo 'TRUE=$(BAR$(V))
7.456 -BAR0=false
7.457 -BAR1=true
7.458 -V=1
7.459 -am__doit:
7.460 - @$(TRUE)
7.461 -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
7.462 - am_cv_make_support_nested_variables=yes
7.463 -else
7.464 - am_cv_make_support_nested_variables=no
7.465 -fi
7.466 -fi
7.467 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
7.468 -$as_echo "$am_cv_make_support_nested_variables" >&6; }
7.469 -if test $am_cv_make_support_nested_variables = yes; then
7.470 - AM_V='$(V)'
7.471 - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
7.472 -else
7.473 - AM_V=$AM_DEFAULT_VERBOSITY
7.474 - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
7.475 -fi
7.476 -AM_BACKSLASH='\'
7.477 -
7.478 if test "`cd $srcdir && pwd`" != "`pwd`"; then
7.479 # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
7.480 # is not polluted with repeated "-I."
7.481 @@ -2399,22 +2323,12 @@
7.482
7.483 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
7.484
7.485 -# For better backward compatibility. To be removed once Automake 1.9.x
7.486 -# dies out for good. For more background, see:
7.487 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
7.488 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
7.489 -mkdir_p='$(MKDIR_P)'
7.490 -
7.491 # We need awk for the "check" target. The system "awk" is bad on
7.492 # some platforms.
7.493 # Always define AMTAR for backward compatibility. Yes, it's still used
7.494 # in the wild :-( We should find a proper way to deprecate it ...
7.495 AMTAR='$${TAR-tar}'
7.496
7.497 -
7.498 -# We'll loop over all known methods to create a tar archive until one works.
7.499 -_am_tools='gnutar pax cpio none'
7.500 -
7.501 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
7.502
7.503
7.504 @@ -2422,7 +2336,6 @@
7.505
7.506
7.507
7.508 -
7.509 ac_ext=c
7.510 ac_cpp='$CPP $CPPFLAGS'
7.511 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7.512 @@ -2445,7 +2358,7 @@
7.513 IFS=$as_save_IFS
7.514 test -z "$as_dir" && as_dir=.
7.515 for ac_exec_ext in '' $ac_executable_extensions; do
7.516 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.517 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.518 ac_cv_prog_CC="${ac_tool_prefix}gcc"
7.519 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7.520 break 2
7.521 @@ -2485,7 +2398,7 @@
7.522 IFS=$as_save_IFS
7.523 test -z "$as_dir" && as_dir=.
7.524 for ac_exec_ext in '' $ac_executable_extensions; do
7.525 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.526 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.527 ac_cv_prog_ac_ct_CC="gcc"
7.528 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7.529 break 2
7.530 @@ -2538,7 +2451,7 @@
7.531 IFS=$as_save_IFS
7.532 test -z "$as_dir" && as_dir=.
7.533 for ac_exec_ext in '' $ac_executable_extensions; do
7.534 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.535 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.536 ac_cv_prog_CC="${ac_tool_prefix}cc"
7.537 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7.538 break 2
7.539 @@ -2579,7 +2492,7 @@
7.540 IFS=$as_save_IFS
7.541 test -z "$as_dir" && as_dir=.
7.542 for ac_exec_ext in '' $ac_executable_extensions; do
7.543 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.544 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.545 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
7.546 ac_prog_rejected=yes
7.547 continue
7.548 @@ -2637,7 +2550,7 @@
7.549 IFS=$as_save_IFS
7.550 test -z "$as_dir" && as_dir=.
7.551 for ac_exec_ext in '' $ac_executable_extensions; do
7.552 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.553 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.554 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
7.555 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7.556 break 2
7.557 @@ -2681,7 +2594,7 @@
7.558 IFS=$as_save_IFS
7.559 test -z "$as_dir" && as_dir=.
7.560 for ac_exec_ext in '' $ac_executable_extensions; do
7.561 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.562 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.563 ac_cv_prog_ac_ct_CC="$ac_prog"
7.564 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7.565 break 2
7.566 @@ -3127,7 +3040,8 @@
7.567 /* end confdefs.h. */
7.568 #include <stdarg.h>
7.569 #include <stdio.h>
7.570 -struct stat;
7.571 +#include <sys/types.h>
7.572 +#include <sys/stat.h>
7.573 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
7.574 struct buf { int x; };
7.575 FILE * (*rcsopen) (struct buf *, struct stat *, int);
7.576 @@ -3230,7 +3144,7 @@
7.577 _am_result=none
7.578 # First try GNU make style include.
7.579 echo "include confinc" > confmf
7.580 -# Ignore all kinds of additional output from 'make'.
7.581 +# Ignore all kinds of additional output from `make'.
7.582 case `$am_make -s -f confmf 2> /dev/null` in #(
7.583 *the\ am__doit\ target*)
7.584 am__include=include
7.585 @@ -3286,8 +3200,8 @@
7.586 # We make a subdir and do the tests there. Otherwise we can end up
7.587 # making bogus files that we don't know about and never remove. For
7.588 # instance it was reported that on HP-UX the gcc test will end up
7.589 - # making a dummy file named 'D' -- because '-MD' means "put the output
7.590 - # in D".
7.591 + # making a dummy file named `D' -- because `-MD' means `put the output
7.592 + # in D'.
7.593 rm -rf conftest.dir
7.594 mkdir conftest.dir
7.595 # Copy depcomp to subdir because otherwise we won't find it if we're
7.596 @@ -3322,16 +3236,16 @@
7.597 : > sub/conftest.c
7.598 for i in 1 2 3 4 5 6; do
7.599 echo '#include "conftst'$i'.h"' >> sub/conftest.c
7.600 - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
7.601 - # Solaris 10 /bin/sh.
7.602 - echo '/* dummy */' > sub/conftst$i.h
7.603 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
7.604 + # Solaris 8's {/usr,}/bin/sh.
7.605 + touch sub/conftst$i.h
7.606 done
7.607 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
7.608
7.609 - # We check with '-c' and '-o' for the sake of the "dashmstdout"
7.610 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
7.611 # mode. It turns out that the SunPro C++ compiler does not properly
7.612 - # handle '-M -o', and we need to detect this. Also, some Intel
7.613 - # versions had trouble with output in subdirs.
7.614 + # handle `-M -o', and we need to detect this. Also, some Intel
7.615 + # versions had trouble with output in subdirs
7.616 am__obj=sub/conftest.${OBJEXT-o}
7.617 am__minus_obj="-o $am__obj"
7.618 case $depmode in
7.619 @@ -3340,8 +3254,8 @@
7.620 test "$am__universal" = false || continue
7.621 ;;
7.622 nosideeffect)
7.623 - # After this tag, mechanisms are not by side-effect, so they'll
7.624 - # only be used when explicitly requested.
7.625 + # after this tag, mechanisms are not by side-effect, so they'll
7.626 + # only be used when explicitly requested
7.627 if test "x$enable_dependency_tracking" = xyes; then
7.628 continue
7.629 else
7.630 @@ -3349,7 +3263,7 @@
7.631 fi
7.632 ;;
7.633 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
7.634 - # This compiler won't grok '-c -o', but also, the minuso test has
7.635 + # This compiler won't grok `-c -o', but also, the minuso test has
7.636 # not run yet. These depmodes are late enough in the game, and
7.637 # so weak that their functioning should not be impacted.
7.638 am__obj=conftest.${OBJEXT-o}
7.639 @@ -3431,7 +3345,7 @@
7.640 IFS=$as_save_IFS
7.641 test -z "$as_dir" && as_dir=.
7.642 for ac_exec_ext in '' $ac_executable_extensions; do
7.643 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.644 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.645 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
7.646 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7.647 break 2
7.648 @@ -3475,7 +3389,7 @@
7.649 IFS=$as_save_IFS
7.650 test -z "$as_dir" && as_dir=.
7.651 for ac_exec_ext in '' $ac_executable_extensions; do
7.652 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.653 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.654 ac_cv_prog_ac_ct_CXX="$ac_prog"
7.655 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7.656 break 2
7.657 @@ -3671,8 +3585,8 @@
7.658 # We make a subdir and do the tests there. Otherwise we can end up
7.659 # making bogus files that we don't know about and never remove. For
7.660 # instance it was reported that on HP-UX the gcc test will end up
7.661 - # making a dummy file named 'D' -- because '-MD' means "put the output
7.662 - # in D".
7.663 + # making a dummy file named `D' -- because `-MD' means `put the output
7.664 + # in D'.
7.665 rm -rf conftest.dir
7.666 mkdir conftest.dir
7.667 # Copy depcomp to subdir because otherwise we won't find it if we're
7.668 @@ -3707,16 +3621,16 @@
7.669 : > sub/conftest.c
7.670 for i in 1 2 3 4 5 6; do
7.671 echo '#include "conftst'$i'.h"' >> sub/conftest.c
7.672 - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
7.673 - # Solaris 10 /bin/sh.
7.674 - echo '/* dummy */' > sub/conftst$i.h
7.675 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
7.676 + # Solaris 8's {/usr,}/bin/sh.
7.677 + touch sub/conftst$i.h
7.678 done
7.679 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
7.680
7.681 - # We check with '-c' and '-o' for the sake of the "dashmstdout"
7.682 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
7.683 # mode. It turns out that the SunPro C++ compiler does not properly
7.684 - # handle '-M -o', and we need to detect this. Also, some Intel
7.685 - # versions had trouble with output in subdirs.
7.686 + # handle `-M -o', and we need to detect this. Also, some Intel
7.687 + # versions had trouble with output in subdirs
7.688 am__obj=sub/conftest.${OBJEXT-o}
7.689 am__minus_obj="-o $am__obj"
7.690 case $depmode in
7.691 @@ -3725,8 +3639,8 @@
7.692 test "$am__universal" = false || continue
7.693 ;;
7.694 nosideeffect)
7.695 - # After this tag, mechanisms are not by side-effect, so they'll
7.696 - # only be used when explicitly requested.
7.697 + # after this tag, mechanisms are not by side-effect, so they'll
7.698 + # only be used when explicitly requested
7.699 if test "x$enable_dependency_tracking" = xyes; then
7.700 continue
7.701 else
7.702 @@ -3734,7 +3648,7 @@
7.703 fi
7.704 ;;
7.705 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
7.706 - # This compiler won't grok '-c -o', but also, the minuso test has
7.707 + # This compiler won't grok `-c -o', but also, the minuso test has
7.708 # not run yet. These depmodes are late enough in the game, and
7.709 # so weak that their functioning should not be impacted.
7.710 am__obj=conftest.${OBJEXT-o}
7.711 @@ -3805,7 +3719,7 @@
7.712 IFS=$as_save_IFS
7.713 test -z "$as_dir" && as_dir=.
7.714 for ac_exec_ext in '' $ac_executable_extensions; do
7.715 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.716 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.717 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
7.718 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7.719 break 2
7.720 @@ -3845,7 +3759,7 @@
7.721 IFS=$as_save_IFS
7.722 test -z "$as_dir" && as_dir=.
7.723 for ac_exec_ext in '' $ac_executable_extensions; do
7.724 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7.725 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7.726 ac_cv_prog_ac_ct_RANLIB="ranlib"
7.727 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7.728 break 2
7.729 @@ -4188,6 +4102,7 @@
7.730
7.731 ac_libobjs=
7.732 ac_ltlibobjs=
7.733 +U=
7.734 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
7.735 # 1. Remove the extension, and $U if already installed.
7.736 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
7.737 @@ -4202,14 +4117,6 @@
7.738 LTLIBOBJS=$ac_ltlibobjs
7.739
7.740
7.741 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
7.742 -$as_echo_n "checking that generated files are newer than configure... " >&6; }
7.743 - if test -n "$am_sleep_pid"; then
7.744 - # Hide warnings about reused PIDs.
7.745 - wait $am_sleep_pid 2>/dev/null
7.746 - fi
7.747 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
7.748 -$as_echo "done" >&6; }
7.749 if test -n "$EXEEXT"; then
7.750 am__EXEEXT_TRUE=
7.751 am__EXEEXT_FALSE='#'
7.752 @@ -4540,16 +4447,16 @@
7.753 # ... but there are two gotchas:
7.754 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
7.755 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
7.756 - # In both cases, we have to default to `cp -pR'.
7.757 + # In both cases, we have to default to `cp -p'.
7.758 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
7.759 - as_ln_s='cp -pR'
7.760 + as_ln_s='cp -p'
7.761 elif ln conf$$.file conf$$ 2>/dev/null; then
7.762 as_ln_s=ln
7.763 else
7.764 - as_ln_s='cp -pR'
7.765 + as_ln_s='cp -p'
7.766 fi
7.767 else
7.768 - as_ln_s='cp -pR'
7.769 + as_ln_s='cp -p'
7.770 fi
7.771 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
7.772 rmdir conf$$.dir 2>/dev/null
7.773 @@ -4609,16 +4516,28 @@
7.774 as_mkdir_p=false
7.775 fi
7.776
7.777 -
7.778 -# as_fn_executable_p FILE
7.779 -# -----------------------
7.780 -# Test if FILE is an executable regular file.
7.781 -as_fn_executable_p ()
7.782 -{
7.783 - test -f "$1" && test -x "$1"
7.784 -} # as_fn_executable_p
7.785 -as_test_x='test -x'
7.786 -as_executable_p=as_fn_executable_p
7.787 +if test -x / >/dev/null 2>&1; then
7.788 + as_test_x='test -x'
7.789 +else
7.790 + if ls -dL / >/dev/null 2>&1; then
7.791 + as_ls_L_option=L
7.792 + else
7.793 + as_ls_L_option=
7.794 + fi
7.795 + as_test_x='
7.796 + eval sh -c '\''
7.797 + if test -d "$1"; then
7.798 + test -d "$1/.";
7.799 + else
7.800 + case $1 in #(
7.801 + -*)set "./$1";;
7.802 + esac;
7.803 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
7.804 + ???[sx]*):;;*)false;;esac;fi
7.805 + '\'' sh
7.806 + '
7.807 +fi
7.808 +as_executable_p=$as_test_x
7.809
7.810 # Sed expression to map a string onto a valid CPP name.
7.811 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
7.812 @@ -4640,7 +4559,7 @@
7.813 # values after options handling.
7.814 ac_log="
7.815 This file was extended by ltplib $as_me 0.1, which was
7.816 -generated by GNU Autoconf 2.69. Invocation command line was
7.817 +generated by GNU Autoconf 2.68. Invocation command line was
7.818
7.819 CONFIG_FILES = $CONFIG_FILES
7.820 CONFIG_HEADERS = $CONFIG_HEADERS
7.821 @@ -4706,10 +4625,10 @@
7.822 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
7.823 ac_cs_version="\\
7.824 ltplib config.status 0.1
7.825 -configured by $0, generated by GNU Autoconf 2.69,
7.826 +configured by $0, generated by GNU Autoconf 2.68,
7.827 with options \\"\$ac_cs_config\\"
7.828
7.829 -Copyright (C) 2012 Free Software Foundation, Inc.
7.830 +Copyright (C) 2010 Free Software Foundation, Inc.
7.831 This config.status script is free software; the Free Software Foundation
7.832 gives unlimited permission to copy, distribute and modify it."
7.833
7.834 @@ -4800,7 +4719,7 @@
7.835 _ACEOF
7.836 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
7.837 if \$ac_cs_recheck; then
7.838 - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
7.839 + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
7.840 shift
7.841 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
7.842 CONFIG_SHELL='$SHELL'
7.843 @@ -5437,7 +5356,7 @@
7.844
7.845 case $ac_file$ac_mode in
7.846 "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
7.847 - # Older Autoconf quotes --file arguments for eval, but not when files
7.848 + # Autoconf 2.62 quotes --file arguments for eval, but not when files
7.849 # are listed without --file. Let's play safe and only enable the eval
7.850 # if we detect the quoting.
7.851 case $CONFIG_FILES in
7.852 @@ -5450,7 +5369,7 @@
7.853 # Strip MF so we end up with the name of the file.
7.854 mf=`echo "$mf" | sed -e 's/:.*$//'`
7.855 # Check whether this is an Automake generated Makefile or not.
7.856 - # We used to match only the files named 'Makefile.in', but
7.857 + # We used to match only the files named `Makefile.in', but
7.858 # some people rename them; so instead we look at the file content.
7.859 # Grep'ing the first line is not enough: some people post-process
7.860 # each Makefile.in and add a new line on top of each file to say so.
7.861 @@ -5484,19 +5403,21 @@
7.862 continue
7.863 fi
7.864 # Extract the definition of DEPDIR, am__include, and am__quote
7.865 - # from the Makefile without running 'make'.
7.866 + # from the Makefile without running `make'.
7.867 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
7.868 test -z "$DEPDIR" && continue
7.869 am__include=`sed -n 's/^am__include = //p' < "$mf"`
7.870 - test -z "$am__include" && continue
7.871 + test -z "am__include" && continue
7.872 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
7.873 + # When using ansi2knr, U may be empty or an underscore; expand it
7.874 + U=`sed -n 's/^U = //p' < "$mf"`
7.875 # Find all dependency output files, they are included files with
7.876 # $(DEPDIR) in their names. We invoke sed twice because it is the
7.877 # simplest approach to changing $(DEPDIR) to its actual value in the
7.878 # expansion.
7.879 for file in `sed -n "
7.880 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
7.881 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
7.882 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
7.883 # Make sure the directory exists.
7.884 test -f "$dirpart/$file" && continue
7.885 fdir=`$as_dirname -- "$file" ||
8.1 --- a/doc/Makefile.in Fri Mar 28 16:21:31 2014 +0000
8.2 +++ b/doc/Makefile.in Sat Mar 29 13:10:05 2014 +0000
8.3 @@ -155,9 +155,9 @@
8.4 exit 1;; \
8.5 esac; \
8.6 done; \
8.7 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
8.8 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
8.9 $(am__cd) $(top_srcdir) && \
8.10 - $(AUTOMAKE) --foreign doc/Makefile
8.11 + $(AUTOMAKE) --gnu doc/Makefile
8.12 .PRECIOUS: Makefile
8.13 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
8.14 @case '$?' in \
9.1 --- a/include/ltp.h Fri Mar 28 16:21:31 2014 +0000
9.2 +++ b/include/ltp.h Sat Mar 29 13:10:05 2014 +0000
9.3 @@ -1,12 +1,10 @@
9.4 /*!
9.5 * @file ltp.h
9.6 * @brief This is the external interface for our transport protocol
9.7 - * @version $Revision: 1.32 $ $Author: stephen $
9.8 - * @version Copyright (C) 2006 Trinity College Dublin
9.9 - * My LTP is based upon draft-irtf-dtnrg-ltp-0?.txt,
9.10 - * initially on the file called draft-irtf-dtnrg-ltp-08.txt
9.11 - * as posted to the DTNRG list on 20040317 (happy
9.12 - * paddy's day!)
9.13 + * @version $Revision: 1.4 $ $Author: stephen $
9.14 + * @version Copyright (C) 2006-2012 Trinity College Dublin
9.15 + * @version Copyright (C) 2013-2014 Tolerant Networks Limited
9.16 + * My LTP is based upon RFC 5325, 5326 and 5327 of course:-)
9.17 * This API is modelled on the sockets API as a kind of mixture between connection
9.18 * and connectionless functions, see e.g.:
9.19 * http://www.fifi.org/cgi-bin/man2html/usr/share/man/man7/udp.7.gz
10.1 --- a/install-sh Fri Mar 28 16:21:31 2014 +0000
10.2 +++ b/install-sh Sat Mar 29 13:10:05 2014 +0000
10.3 @@ -1,1 +1,1 @@
10.4 -/usr/share/automake-1.13/install-sh
10.5 \ No newline at end of file
10.6 +/usr/share/automake-1.11/install-sh
10.7 \ No newline at end of file
11.1 --- a/lib/Makefile.in Fri Mar 28 16:21:31 2014 +0000
11.2 +++ b/lib/Makefile.in Sat Mar 29 13:10:05 2014 +0000
11.3 @@ -157,9 +157,9 @@
11.4 exit 1;; \
11.5 esac; \
11.6 done; \
11.7 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \
11.8 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
11.9 $(am__cd) $(top_srcdir) && \
11.10 - $(AUTOMAKE) --foreign lib/Makefile
11.11 + $(AUTOMAKE) --gnu lib/Makefile
11.12 .PRECIOUS: Makefile
11.13 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
11.14 @case '$?' in \
12.1 --- a/src/Makefile.in Fri Mar 28 16:21:31 2014 +0000
12.2 +++ b/src/Makefile.in Sat Mar 29 13:10:05 2014 +0000
12.3 @@ -293,9 +293,9 @@
12.4 exit 1;; \
12.5 esac; \
12.6 done; \
12.7 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
12.8 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
12.9 $(am__cd) $(top_srcdir) && \
12.10 - $(AUTOMAKE) --foreign src/Makefile
12.11 + $(AUTOMAKE) --gnu src/Makefile
12.12 .PRECIOUS: Makefile
12.13 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12.14 @case '$?' in \
13.1 --- a/test/Makefile.in Fri Mar 28 16:21:31 2014 +0000
13.2 +++ b/test/Makefile.in Sat Mar 29 13:10:05 2014 +0000
13.3 @@ -197,9 +197,9 @@
13.4 exit 1;; \
13.5 esac; \
13.6 done; \
13.7 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
13.8 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
13.9 $(am__cd) $(top_srcdir) && \
13.10 - $(AUTOMAKE) --foreign test/Makefile
13.11 + $(AUTOMAKE) --gnu test/Makefile
13.12 .PRECIOUS: Makefile
13.13 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
13.14 @case '$?' in \