passenger 5.0.30 → 5.1.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of passenger might be problematic. Click here for more details.

Files changed (131) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +30 -1
  3. data/CONTRIBUTING.md +1 -1
  4. data/CONTRIBUTORS +2 -0
  5. data/bin/passenger-install-nginx-module +18 -13
  6. data/build/agent.rb +1 -0
  7. data/build/basics.rb +1 -0
  8. data/build/cxx_tests.rb +6 -1
  9. data/build/misc.rb +3 -0
  10. data/build/packaging.rb +5 -17
  11. data/build/support/cxx_dependency_map.rb +100 -0
  12. data/build/support/vendor/cxxcodebuilder/lib/cxxcodebuilder/builder.rb +4 -1
  13. data/build/test_basics.rb +12 -2
  14. data/dev/ci/run_travis.sh +6 -2
  15. data/doc/Users guide Apache.html +7 -2
  16. data/doc/Users guide Apache.txt +4 -0
  17. data/resources/templates/error_layout.css +70 -84
  18. data/resources/templates/error_layout.html.template +84 -93
  19. data/resources/templates/standalone/http.erb +17 -13
  20. data/resources/templates/standalone/server.erb +2 -1
  21. data/resources/templates/undisclosed_error.html.template +52 -51
  22. data/resources/update_check_client_cert.p12 +0 -0
  23. data/resources/update_check_client_cert.pem +89 -0
  24. data/resources/update_check_server_pubkey.pem +14 -0
  25. data/src/agent/Core/ApplicationPool/ErrorRenderer.h +15 -1
  26. data/src/agent/Core/Controller.h +3 -2
  27. data/src/agent/Core/Controller/CheckoutSession.cpp +5 -4
  28. data/src/agent/Core/Controller/ForwardResponse.cpp +1 -1
  29. data/src/agent/Core/Controller/InitRequest.cpp +2 -0
  30. data/src/agent/Core/Controller/InitializationAndShutdown.cpp +1 -0
  31. data/src/agent/Core/Controller/Request.h +1 -0
  32. data/src/agent/Core/CoreMain.cpp +99 -2
  33. data/src/agent/Core/OptionParser.h +18 -1
  34. data/src/agent/Core/SecurityUpdateChecker.h +559 -0
  35. data/src/agent/Shared/Base.cpp +6 -1
  36. data/src/agent/TempDirToucher/TempDirToucherMain.cpp +52 -0
  37. data/src/agent/Watchdog/InstanceDirToucher.cpp +1 -2
  38. data/src/agent/Watchdog/WatchdogMain.cpp +31 -40
  39. data/src/apache2_module/Configuration.cpp +12 -0
  40. data/src/apache2_module/Configuration.hpp +5 -0
  41. data/src/apache2_module/ConfigurationCommands.cpp +19 -19
  42. data/src/apache2_module/ConfigurationCommands.cpp.cxxcodebuilder +2 -2
  43. data/src/apache2_module/ConfigurationFields.hpp +19 -19
  44. data/src/apache2_module/ConfigurationFields.hpp.cxxcodebuilder +2 -2
  45. data/src/apache2_module/ConfigurationSetters.cpp +19 -19
  46. data/src/apache2_module/ConfigurationSetters.cpp.cxxcodebuilder +2 -2
  47. data/src/apache2_module/CreateDirConfig.cpp +19 -19
  48. data/src/apache2_module/CreateDirConfig.cpp.cxxcodebuilder +2 -2
  49. data/src/apache2_module/Hooks.cpp +10 -1
  50. data/src/apache2_module/MergeDirConfig.cpp +19 -19
  51. data/src/apache2_module/MergeDirConfig.cpp.cxxcodebuilder +2 -2
  52. data/src/apache2_module/SetHeaders.cpp +19 -19
  53. data/src/apache2_module/SetHeaders.cpp.cxxcodebuilder +2 -2
  54. data/src/cxx_supportlib/Constants.h +22 -22
  55. data/src/cxx_supportlib/Constants.h.cxxcodebuilder +4 -1
  56. data/src/cxx_supportlib/Crypto.cpp +977 -0
  57. data/src/cxx_supportlib/Crypto.h +147 -0
  58. data/src/cxx_supportlib/InstanceDirectory.h +55 -2
  59. data/src/cxx_supportlib/Utils/Curl.h +24 -10
  60. data/src/cxx_supportlib/Utils/JsonUtils.h +1 -1
  61. data/src/cxx_supportlib/oxt/detail/spin_lock_darwin.hpp +2 -0
  62. data/src/cxx_supportlib/vendor-modified/boost/system/error_code.hpp +3 -3
  63. data/src/cxx_supportlib/vendor-modified/jsoncpp/json-forwards.h +167 -92
  64. data/src/cxx_supportlib/vendor-modified/jsoncpp/json.h +1827 -1542
  65. data/src/cxx_supportlib/vendor-modified/jsoncpp/jsoncpp.cpp +4705 -3652
  66. data/src/cxx_supportlib/vendor-modified/libev/Changes +46 -15
  67. data/src/cxx_supportlib/vendor-modified/libev/LICENSE +1 -1
  68. data/src/cxx_supportlib/vendor-modified/libev/Makefile.in +215 -128
  69. data/src/cxx_supportlib/vendor-modified/libev/aclocal.m4 +466 -275
  70. data/src/cxx_supportlib/vendor-modified/libev/config.guess +312 -418
  71. data/src/cxx_supportlib/vendor-modified/libev/config.sub +246 -105
  72. data/src/cxx_supportlib/vendor-modified/libev/configure +276 -72
  73. data/src/cxx_supportlib/vendor-modified/libev/configure.ac +2 -1
  74. data/src/cxx_supportlib/vendor-modified/libev/depcomp +346 -185
  75. data/src/cxx_supportlib/vendor-modified/libev/ev++.h +1 -1
  76. data/src/cxx_supportlib/vendor-modified/libev/ev.c +530 -190
  77. data/src/cxx_supportlib/vendor-modified/libev/ev.h +23 -14
  78. data/src/cxx_supportlib/vendor-modified/libev/ev_epoll.c +12 -6
  79. data/src/cxx_supportlib/vendor-modified/libev/ev_kqueue.c +9 -5
  80. data/src/cxx_supportlib/vendor-modified/libev/ev_poll.c +6 -3
  81. data/src/cxx_supportlib/vendor-modified/libev/ev_port.c +8 -4
  82. data/src/cxx_supportlib/vendor-modified/libev/ev_select.c +4 -2
  83. data/src/cxx_supportlib/vendor-modified/libev/ev_vars.h +3 -2
  84. data/src/cxx_supportlib/vendor-modified/libev/ev_win32.c +3 -4
  85. data/src/cxx_supportlib/vendor-modified/libev/install-sh +433 -219
  86. data/src/cxx_supportlib/vendor-modified/libev/libev.m4 +6 -6
  87. data/src/cxx_supportlib/vendor-modified/libev/ltmain.sh +2 -2
  88. data/src/cxx_supportlib/vendor-modified/libev/missing +167 -288
  89. data/src/cxx_supportlib/vendor-modified/libev/mkinstalldirs +72 -21
  90. data/src/cxx_supportlib/vendor-modified/modp_b64.cpp +4 -106
  91. data/src/cxx_supportlib/vendor-modified/modp_b64_data.h +37 -1
  92. data/src/cxx_supportlib/vendor-modified/modp_b64_strict_aliasing.cpp +119 -0
  93. data/src/helper-scripts/node-loader.js +72 -1
  94. data/src/nginx_module/CacheLocationConfig.c +52 -19
  95. data/src/nginx_module/CacheLocationConfig.c.cxxcodebuilder +2 -2
  96. data/src/nginx_module/Configuration.c +26 -1
  97. data/src/nginx_module/Configuration.h +2 -0
  98. data/src/nginx_module/ConfigurationCommands.c +35 -19
  99. data/src/nginx_module/ConfigurationCommands.c.cxxcodebuilder +2 -2
  100. data/src/nginx_module/ContentHandler.c +1 -1
  101. data/src/nginx_module/CreateLocationConfig.c +22 -19
  102. data/src/nginx_module/CreateLocationConfig.c.cxxcodebuilder +2 -2
  103. data/src/nginx_module/LocationConfig.h +21 -19
  104. data/src/nginx_module/LocationConfig.h.cxxcodebuilder +2 -2
  105. data/src/nginx_module/MergeLocationConfig.c +25 -19
  106. data/src/nginx_module/MergeLocationConfig.c.cxxcodebuilder +2 -2
  107. data/src/nginx_module/ngx_http_passenger_module.c +8 -4
  108. data/src/ruby_supportlib/phusion_passenger.rb +9 -4
  109. data/src/ruby_supportlib/phusion_passenger/admin_tools/instance.rb +2 -2
  110. data/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb +1 -1
  111. data/src/ruby_supportlib/phusion_passenger/common_library.rb +13 -0
  112. data/src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb +5 -2
  113. data/src/ruby_supportlib/phusion_passenger/constants.rb +1 -1
  114. data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb +15 -3
  115. data/src/ruby_supportlib/phusion_passenger/platform_info/crypto.rb +51 -0
  116. data/src/ruby_supportlib/phusion_passenger/platform_info/depcheck_specs/apache2.rb +7 -0
  117. data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb +17 -0
  118. data/src/ruby_supportlib/phusion_passenger/standalone/start_command.rb +4 -2
  119. data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb +4 -0
  120. data/src/ruby_supportlib/phusion_passenger/standalone/start_command/nginx_engine.rb +5 -0
  121. data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/app.rb +19 -10
  122. data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/base.rb +25 -0
  123. data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/gdb_controller.rb +38 -103
  124. data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/lldb_controller.rb +178 -0
  125. data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/utils.rb +94 -0
  126. data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/version.rb +2 -2
  127. data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core.rb +2 -2
  128. data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/version_data.rb +2 -2
  129. data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/ruby_versions.yml.travis +5 -3
  130. data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/ruby_versions.yml.travis-with-sudo +9 -7
  131. metadata +14 -4
@@ -1,8 +1,7 @@
1
- # generated automatically by aclocal 1.11.6 -*- Autoconf -*-
1
+ # generated automatically by aclocal 1.15 -*- Autoconf -*-
2
+
3
+ # Copyright (C) 1996-2014 Free Software Foundation, Inc.
2
4
 
3
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4
- # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
5
- # Inc.
6
5
  # This file is free software; the Free Software Foundation
7
6
  # gives unlimited permission to copy and/or distribute it,
8
7
  # with or without modifications, as long as this notice is preserved.
@@ -12,13 +11,14 @@
12
11
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13
12
  # PARTICULAR PURPOSE.
14
13
 
14
+ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15
15
  m4_ifndef([AC_AUTOCONF_VERSION],
16
16
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17
17
  m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18
18
  [m4_warning([this file was generated for autoconf 2.69.
19
19
  You have another version of autoconf. It may work, but is not guaranteed to.
20
20
  If you have problems, you may need to regenerate the build system entirely.
21
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
21
+ To do so, use the procedure documented by the package, typically 'autoreconf'.])])
22
22
 
23
23
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
24
24
  #
@@ -1326,7 +1326,7 @@ ia64-*-hpux*)
1326
1326
  rm -rf conftest*
1327
1327
  ;;
1328
1328
 
1329
- x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
1329
+ x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
1330
1330
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
1331
1331
  # Find out which ABI we are using.
1332
1332
  echo 'int i;' > conftest.$ac_ext
@@ -1338,9 +1338,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
1338
1338
  LD="${LD-ld} -m elf_i386_fbsd"
1339
1339
  ;;
1340
1340
  x86_64-*linux*)
1341
- LD="${LD-ld} -m elf_i386"
1341
+ case `/usr/bin/file conftest.o` in
1342
+ *x86-64*)
1343
+ LD="${LD-ld} -m elf32_x86_64"
1344
+ ;;
1345
+ *)
1346
+ LD="${LD-ld} -m elf_i386"
1347
+ ;;
1348
+ esac
1342
1349
  ;;
1343
- ppc64-*linux*|powerpc64-*linux*)
1350
+ powerpc64le-*)
1351
+ LD="${LD-ld} -m elf32lppclinux"
1352
+ ;;
1353
+ powerpc64-*)
1344
1354
  LD="${LD-ld} -m elf32ppclinux"
1345
1355
  ;;
1346
1356
  s390x-*linux*)
@@ -1359,7 +1369,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
1359
1369
  x86_64-*linux*)
1360
1370
  LD="${LD-ld} -m elf_x86_64"
1361
1371
  ;;
1362
- ppc*-*linux*|powerpc*-*linux*)
1372
+ powerpcle-*)
1373
+ LD="${LD-ld} -m elf64lppc"
1374
+ ;;
1375
+ powerpc-*)
1363
1376
  LD="${LD-ld} -m elf64ppc"
1364
1377
  ;;
1365
1378
  s390*-*linux*|s390*-*tpf*)
@@ -1702,7 +1715,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
1702
1715
  ;;
1703
1716
  *)
1704
1717
  lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
1705
- if test -n "$lt_cv_sys_max_cmd_len"; then
1718
+ if test -n "$lt_cv_sys_max_cmd_len" && \
1719
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
1706
1720
  lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
1707
1721
  lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
1708
1722
  else
@@ -8608,25 +8622,22 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
8608
8622
  m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
8609
8623
  m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
8610
8624
 
8611
- # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
8612
- # Foundation, Inc.
8625
+ # Copyright (C) 2002-2014 Free Software Foundation, Inc.
8613
8626
  #
8614
8627
  # This file is free software; the Free Software Foundation
8615
8628
  # gives unlimited permission to copy and/or distribute it,
8616
8629
  # with or without modifications, as long as this notice is preserved.
8617
8630
 
8618
- # serial 1
8619
-
8620
8631
  # AM_AUTOMAKE_VERSION(VERSION)
8621
8632
  # ----------------------------
8622
8633
  # Automake X.Y traces this macro to ensure aclocal.m4 has been
8623
8634
  # generated from the m4 files accompanying Automake X.Y.
8624
8635
  # (This private macro should not be called outside this file.)
8625
8636
  AC_DEFUN([AM_AUTOMAKE_VERSION],
8626
- [am__api_version='1.11'
8637
+ [am__api_version='1.15'
8627
8638
  dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
8628
8639
  dnl require some minimum version. Point them to the right macro.
8629
- m4_if([$1], [1.11.6], [],
8640
+ m4_if([$1], [1.15], [],
8630
8641
  [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
8631
8642
  ])
8632
8643
 
@@ -8642,24 +8653,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
8642
8653
  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
8643
8654
  # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
8644
8655
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
8645
- [AM_AUTOMAKE_VERSION([1.11.6])dnl
8656
+ [AM_AUTOMAKE_VERSION([1.15])dnl
8646
8657
  m4_ifndef([AC_AUTOCONF_VERSION],
8647
8658
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
8648
8659
  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
8649
8660
 
8650
8661
  # AM_AUX_DIR_EXPAND -*- Autoconf -*-
8651
8662
 
8652
- # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
8663
+ # Copyright (C) 2001-2014 Free Software Foundation, Inc.
8653
8664
  #
8654
8665
  # This file is free software; the Free Software Foundation
8655
8666
  # gives unlimited permission to copy and/or distribute it,
8656
8667
  # with or without modifications, as long as this notice is preserved.
8657
8668
 
8658
- # serial 1
8659
-
8660
8669
  # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
8661
- # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
8662
- # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
8670
+ # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
8671
+ # '$srcdir', '$srcdir/..', or '$srcdir/../..'.
8663
8672
  #
8664
8673
  # Of course, Automake must honor this variable whenever it calls a
8665
8674
  # tool from the auxiliary directory. The problem is that $srcdir (and
@@ -8678,7 +8687,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
8678
8687
  #
8679
8688
  # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
8680
8689
  # are both prefixed by $srcdir. In an in-source build this is usually
8681
- # harmless because $srcdir is `.', but things will broke when you
8690
+ # harmless because $srcdir is '.', but things will broke when you
8682
8691
  # start a VPATH build or use an absolute $srcdir.
8683
8692
  #
8684
8693
  # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -8696,30 +8705,26 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
8696
8705
  # configured tree to be moved without reconfiguration.
8697
8706
 
8698
8707
  AC_DEFUN([AM_AUX_DIR_EXPAND],
8699
- [dnl Rely on autoconf to set up CDPATH properly.
8700
- AC_PREREQ([2.50])dnl
8701
- # expand $ac_aux_dir to an absolute path
8702
- am_aux_dir=`cd $ac_aux_dir && pwd`
8708
+ [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
8709
+ # Expand $ac_aux_dir to an absolute path.
8710
+ am_aux_dir=`cd "$ac_aux_dir" && pwd`
8703
8711
  ])
8704
8712
 
8705
8713
  # AM_CONDITIONAL -*- Autoconf -*-
8706
8714
 
8707
- # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
8708
- # Free Software Foundation, Inc.
8715
+ # Copyright (C) 1997-2014 Free Software Foundation, Inc.
8709
8716
  #
8710
8717
  # This file is free software; the Free Software Foundation
8711
8718
  # gives unlimited permission to copy and/or distribute it,
8712
8719
  # with or without modifications, as long as this notice is preserved.
8713
8720
 
8714
- # serial 9
8715
-
8716
8721
  # AM_CONDITIONAL(NAME, SHELL-CONDITION)
8717
8722
  # -------------------------------------
8718
8723
  # Define a conditional.
8719
8724
  AC_DEFUN([AM_CONDITIONAL],
8720
- [AC_PREREQ(2.52)dnl
8721
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
8722
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
8725
+ [AC_PREREQ([2.52])dnl
8726
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
8727
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
8723
8728
  AC_SUBST([$1_TRUE])dnl
8724
8729
  AC_SUBST([$1_FALSE])dnl
8725
8730
  _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -8738,16 +8743,14 @@ AC_CONFIG_COMMANDS_PRE(
8738
8743
  Usually this means the macro was only invoked conditionally.]])
8739
8744
  fi])])
8740
8745
 
8741
- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
8742
- # 2010, 2011 Free Software Foundation, Inc.
8746
+ # Copyright (C) 1999-2014 Free Software Foundation, Inc.
8743
8747
  #
8744
8748
  # This file is free software; the Free Software Foundation
8745
8749
  # gives unlimited permission to copy and/or distribute it,
8746
8750
  # with or without modifications, as long as this notice is preserved.
8747
8751
 
8748
- # serial 12
8749
8752
 
8750
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
8753
+ # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
8751
8754
  # written in clear, in which case automake, when reading aclocal.m4,
8752
8755
  # will think it sees a *use*, and therefore will trigger all it's
8753
8756
  # C support machinery. Also note that it means that autoscan, seeing
@@ -8757,7 +8760,7 @@ fi])])
8757
8760
  # _AM_DEPENDENCIES(NAME)
8758
8761
  # ----------------------
8759
8762
  # See how the compiler implements dependency checking.
8760
- # NAME is "CC", "CXX", "GCJ", or "OBJC".
8763
+ # NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
8761
8764
  # We try a few techniques and use that to set a single cache variable.
8762
8765
  #
8763
8766
  # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -8770,12 +8773,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
8770
8773
  AC_REQUIRE([AM_MAKE_INCLUDE])dnl
8771
8774
  AC_REQUIRE([AM_DEP_TRACK])dnl
8772
8775
 
8773
- ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
8774
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
8775
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
8776
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
8777
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
8778
- [depcc="$$1" am_compiler_list=])
8776
+ m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
8777
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
8778
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
8779
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
8780
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
8781
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
8782
+ [depcc="$$1" am_compiler_list=])
8779
8783
 
8780
8784
  AC_CACHE_CHECK([dependency style of $depcc],
8781
8785
  [am_cv_$1_dependencies_compiler_type],
@@ -8783,8 +8787,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
8783
8787
  # We make a subdir and do the tests there. Otherwise we can end up
8784
8788
  # making bogus files that we don't know about and never remove. For
8785
8789
  # instance it was reported that on HP-UX the gcc test will end up
8786
- # making a dummy file named `D' -- because `-MD' means `put the output
8787
- # in D'.
8790
+ # making a dummy file named 'D' -- because '-MD' means "put the output
8791
+ # in D".
8788
8792
  rm -rf conftest.dir
8789
8793
  mkdir conftest.dir
8790
8794
  # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -8824,16 +8828,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
8824
8828
  : > sub/conftest.c
8825
8829
  for i in 1 2 3 4 5 6; do
8826
8830
  echo '#include "conftst'$i'.h"' >> sub/conftest.c
8827
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
8828
- # Solaris 8's {/usr,}/bin/sh.
8829
- touch sub/conftst$i.h
8831
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
8832
+ # Solaris 10 /bin/sh.
8833
+ echo '/* dummy */' > sub/conftst$i.h
8830
8834
  done
8831
8835
  echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
8832
8836
 
8833
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
8837
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
8834
8838
  # mode. It turns out that the SunPro C++ compiler does not properly
8835
- # handle `-M -o', and we need to detect this. Also, some Intel
8836
- # versions had trouble with output in subdirs
8839
+ # handle '-M -o', and we need to detect this. Also, some Intel
8840
+ # versions had trouble with output in subdirs.
8837
8841
  am__obj=sub/conftest.${OBJEXT-o}
8838
8842
  am__minus_obj="-o $am__obj"
8839
8843
  case $depmode in
@@ -8842,8 +8846,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
8842
8846
  test "$am__universal" = false || continue
8843
8847
  ;;
8844
8848
  nosideeffect)
8845
- # after this tag, mechanisms are not by side-effect, so they'll
8846
- # only be used when explicitly requested
8849
+ # After this tag, mechanisms are not by side-effect, so they'll
8850
+ # only be used when explicitly requested.
8847
8851
  if test "x$enable_dependency_tracking" = xyes; then
8848
8852
  continue
8849
8853
  else
@@ -8851,7 +8855,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
8851
8855
  fi
8852
8856
  ;;
8853
8857
  msvc7 | msvc7msys | msvisualcpp | msvcmsys)
8854
- # This compiler won't grok `-c -o', but also, the minuso test has
8858
+ # This compiler won't grok '-c -o', but also, the minuso test has
8855
8859
  # not run yet. These depmodes are late enough in the game, and
8856
8860
  # so weak that their functioning should not be impacted.
8857
8861
  am__obj=conftest.${OBJEXT-o}
@@ -8899,7 +8903,7 @@ AM_CONDITIONAL([am__fastdep$1], [
8899
8903
  # AM_SET_DEPDIR
8900
8904
  # -------------
8901
8905
  # Choose a directory name for dependency files.
8902
- # This macro is AC_REQUIREd in _AM_DEPENDENCIES
8906
+ # This macro is AC_REQUIREd in _AM_DEPENDENCIES.
8903
8907
  AC_DEFUN([AM_SET_DEPDIR],
8904
8908
  [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
8905
8909
  AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -8909,9 +8913,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
8909
8913
  # AM_DEP_TRACK
8910
8914
  # ------------
8911
8915
  AC_DEFUN([AM_DEP_TRACK],
8912
- [AC_ARG_ENABLE(dependency-tracking,
8913
- [ --disable-dependency-tracking speeds up one-time build
8914
- --enable-dependency-tracking do not reject slow dependency extractors])
8916
+ [AC_ARG_ENABLE([dependency-tracking], [dnl
8917
+ AS_HELP_STRING(
8918
+ [--enable-dependency-tracking],
8919
+ [do not reject slow dependency extractors])
8920
+ AS_HELP_STRING(
8921
+ [--disable-dependency-tracking],
8922
+ [speeds up one-time build])])
8915
8923
  if test "x$enable_dependency_tracking" != xno; then
8916
8924
  am_depcomp="$ac_aux_dir/depcomp"
8917
8925
  AMDEPBACKSLASH='\'
@@ -8926,20 +8934,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
8926
8934
 
8927
8935
  # Generate code to set up dependency tracking. -*- Autoconf -*-
8928
8936
 
8929
- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
8930
- # Free Software Foundation, Inc.
8937
+ # Copyright (C) 1999-2014 Free Software Foundation, Inc.
8931
8938
  #
8932
8939
  # This file is free software; the Free Software Foundation
8933
8940
  # gives unlimited permission to copy and/or distribute it,
8934
8941
  # with or without modifications, as long as this notice is preserved.
8935
8942
 
8936
- #serial 5
8937
8943
 
8938
8944
  # _AM_OUTPUT_DEPENDENCY_COMMANDS
8939
8945
  # ------------------------------
8940
8946
  AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
8941
8947
  [{
8942
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
8948
+ # Older Autoconf quotes --file arguments for eval, but not when files
8943
8949
  # are listed without --file. Let's play safe and only enable the eval
8944
8950
  # if we detect the quoting.
8945
8951
  case $CONFIG_FILES in
@@ -8952,7 +8958,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
8952
8958
  # Strip MF so we end up with the name of the file.
8953
8959
  mf=`echo "$mf" | sed -e 's/:.*$//'`
8954
8960
  # Check whether this is an Automake generated Makefile or not.
8955
- # We used to match only the files named `Makefile.in', but
8961
+ # We used to match only the files named 'Makefile.in', but
8956
8962
  # some people rename them; so instead we look at the file content.
8957
8963
  # Grep'ing the first line is not enough: some people post-process
8958
8964
  # each Makefile.in and add a new line on top of each file to say so.
@@ -8964,21 +8970,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
8964
8970
  continue
8965
8971
  fi
8966
8972
  # Extract the definition of DEPDIR, am__include, and am__quote
8967
- # from the Makefile without running `make'.
8973
+ # from the Makefile without running 'make'.
8968
8974
  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
8969
8975
  test -z "$DEPDIR" && continue
8970
8976
  am__include=`sed -n 's/^am__include = //p' < "$mf"`
8971
- test -z "am__include" && continue
8977
+ test -z "$am__include" && continue
8972
8978
  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
8973
- # When using ansi2knr, U may be empty or an underscore; expand it
8974
- U=`sed -n 's/^U = //p' < "$mf"`
8975
8979
  # Find all dependency output files, they are included files with
8976
8980
  # $(DEPDIR) in their names. We invoke sed twice because it is the
8977
8981
  # simplest approach to changing $(DEPDIR) to its actual value in the
8978
8982
  # expansion.
8979
8983
  for file in `sed -n "
8980
8984
  s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
8981
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
8985
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
8982
8986
  # Make sure the directory exists.
8983
8987
  test -f "$dirpart/$file" && continue
8984
8988
  fdir=`AS_DIRNAME(["$file"])`
@@ -8996,7 +9000,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
8996
9000
  # This macro should only be invoked once -- use via AC_REQUIRE.
8997
9001
  #
8998
9002
  # This code is only required when automatic dependency tracking
8999
- # is enabled. FIXME. This creates each `.P' file that we will
9003
+ # is enabled. FIXME. This creates each '.P' file that we will
9000
9004
  # need in order to bootstrap the dependency handling code.
9001
9005
  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
9002
9006
  [AC_CONFIG_COMMANDS([depfiles],
@@ -9006,18 +9010,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
9006
9010
 
9007
9011
  # Do all the work for Automake. -*- Autoconf -*-
9008
9012
 
9009
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
9010
- # 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
9013
+ # Copyright (C) 1996-2014 Free Software Foundation, Inc.
9011
9014
  #
9012
9015
  # This file is free software; the Free Software Foundation
9013
9016
  # gives unlimited permission to copy and/or distribute it,
9014
9017
  # with or without modifications, as long as this notice is preserved.
9015
9018
 
9016
- # serial 16
9017
-
9018
9019
  # This macro actually does too much. Some checks are only needed if
9019
9020
  # your package does certain things. But this isn't really a big deal.
9020
9021
 
9022
+ dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
9023
+ m4_define([AC_PROG_CC],
9024
+ m4_defn([AC_PROG_CC])
9025
+ [_AM_PROG_CC_C_O
9026
+ ])
9027
+
9021
9028
  # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
9022
9029
  # AM_INIT_AUTOMAKE([OPTIONS])
9023
9030
  # -----------------------------------------------
@@ -9030,7 +9037,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
9030
9037
  # arguments mandatory, and then we can depend on a new Autoconf
9031
9038
  # release and drop the old call support.
9032
9039
  AC_DEFUN([AM_INIT_AUTOMAKE],
9033
- [AC_PREREQ([2.62])dnl
9040
+ [AC_PREREQ([2.65])dnl
9034
9041
  dnl Autoconf wants to disallow AM_ names. We explicitly allow
9035
9042
  dnl the ones we care about.
9036
9043
  m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -9059,33 +9066,42 @@ AC_SUBST([CYGPATH_W])
9059
9066
  # Define the identity of the package.
9060
9067
  dnl Distinguish between old-style and new-style calls.
9061
9068
  m4_ifval([$2],
9062
- [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
9069
+ [AC_DIAGNOSE([obsolete],
9070
+ [$0: two- and three-arguments forms are deprecated.])
9071
+ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
9063
9072
  AC_SUBST([PACKAGE], [$1])dnl
9064
9073
  AC_SUBST([VERSION], [$2])],
9065
9074
  [_AM_SET_OPTIONS([$1])dnl
9066
9075
  dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
9067
- m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
9076
+ m4_if(
9077
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
9078
+ [ok:ok],,
9068
9079
  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
9069
9080
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
9070
9081
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
9071
9082
 
9072
9083
  _AM_IF_OPTION([no-define],,
9073
- [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
9074
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
9084
+ [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
9085
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
9075
9086
 
9076
9087
  # Some tools Automake needs.
9077
9088
  AC_REQUIRE([AM_SANITY_CHECK])dnl
9078
9089
  AC_REQUIRE([AC_ARG_PROGRAM])dnl
9079
- AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
9080
- AM_MISSING_PROG(AUTOCONF, autoconf)
9081
- AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
9082
- AM_MISSING_PROG(AUTOHEADER, autoheader)
9083
- AM_MISSING_PROG(MAKEINFO, makeinfo)
9090
+ AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
9091
+ AM_MISSING_PROG([AUTOCONF], [autoconf])
9092
+ AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
9093
+ AM_MISSING_PROG([AUTOHEADER], [autoheader])
9094
+ AM_MISSING_PROG([MAKEINFO], [makeinfo])
9084
9095
  AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
9085
9096
  AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
9086
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl
9087
- # We need awk for the "check" target. The system "awk" is bad on
9088
- # some platforms.
9097
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
9098
+ # For better backward compatibility. To be removed once Automake 1.9.x
9099
+ # dies out for good. For more background, see:
9100
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
9101
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
9102
+ AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
9103
+ # We need awk for the "check" target (and possibly the TAP driver). The
9104
+ # system "awk" is bad on some platforms.
9089
9105
  AC_REQUIRE([AC_PROG_AWK])dnl
9090
9106
  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
9091
9107
  AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -9094,34 +9110,82 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
9094
9110
  [_AM_PROG_TAR([v7])])])
9095
9111
  _AM_IF_OPTION([no-dependencies],,
9096
9112
  [AC_PROVIDE_IFELSE([AC_PROG_CC],
9097
- [_AM_DEPENDENCIES(CC)],
9098
- [define([AC_PROG_CC],
9099
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
9113
+ [_AM_DEPENDENCIES([CC])],
9114
+ [m4_define([AC_PROG_CC],
9115
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
9100
9116
  AC_PROVIDE_IFELSE([AC_PROG_CXX],
9101
- [_AM_DEPENDENCIES(CXX)],
9102
- [define([AC_PROG_CXX],
9103
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
9117
+ [_AM_DEPENDENCIES([CXX])],
9118
+ [m4_define([AC_PROG_CXX],
9119
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
9104
9120
  AC_PROVIDE_IFELSE([AC_PROG_OBJC],
9105
- [_AM_DEPENDENCIES(OBJC)],
9106
- [define([AC_PROG_OBJC],
9107
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
9121
+ [_AM_DEPENDENCIES([OBJC])],
9122
+ [m4_define([AC_PROG_OBJC],
9123
+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
9124
+ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
9125
+ [_AM_DEPENDENCIES([OBJCXX])],
9126
+ [m4_define([AC_PROG_OBJCXX],
9127
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
9108
9128
  ])
9109
- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
9110
- dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
9111
- dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
9112
- dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
9129
+ AC_REQUIRE([AM_SILENT_RULES])dnl
9130
+ dnl The testsuite driver may need to know about EXEEXT, so add the
9131
+ dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
9132
+ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
9113
9133
  AC_CONFIG_COMMANDS_PRE(dnl
9114
9134
  [m4_provide_if([_AM_COMPILER_EXEEXT],
9115
9135
  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
9136
+
9137
+ # POSIX will say in a future version that running "rm -f" with no argument
9138
+ # is OK; and we want to be able to make that assumption in our Makefile
9139
+ # recipes. So use an aggressive probe to check that the usage we want is
9140
+ # actually supported "in the wild" to an acceptable degree.
9141
+ # See automake bug#10828.
9142
+ # To make any issue more visible, cause the running configure to be aborted
9143
+ # by default if the 'rm' program in use doesn't match our expectations; the
9144
+ # user can still override this though.
9145
+ if rm -f && rm -fr && rm -rf; then : OK; else
9146
+ cat >&2 <<'END'
9147
+ Oops!
9148
+
9149
+ Your 'rm' program seems unable to run without file operands specified
9150
+ on the command line, even when the '-f' option is present. This is contrary
9151
+ to the behaviour of most rm programs out there, and not conforming with
9152
+ the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
9153
+
9154
+ Please tell bug-automake@gnu.org about your system, including the value
9155
+ of your $PATH and any error possibly output before this message. This
9156
+ can help us improve future automake versions.
9157
+
9158
+ END
9159
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
9160
+ echo 'Configuration will proceed anyway, since you have set the' >&2
9161
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
9162
+ echo >&2
9163
+ else
9164
+ cat >&2 <<'END'
9165
+ Aborting the configuration process, to ensure you take notice of the issue.
9166
+
9167
+ You can download and install GNU coreutils to get an 'rm' implementation
9168
+ that behaves properly: <http://www.gnu.org/software/coreutils/>.
9169
+
9170
+ If you want to complete the configuration process using your problematic
9171
+ 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
9172
+ to "yes", and re-run configure.
9173
+
9174
+ END
9175
+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
9176
+ fi
9177
+ fi
9178
+ dnl The trailing newline in this macro's definition is deliberate, for
9179
+ dnl backward compatibility and to allow trailing 'dnl'-style comments
9180
+ dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
9116
9181
  ])
9117
9182
 
9118
- dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
9183
+ dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
9119
9184
  dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
9120
9185
  dnl mangled by Autoconf and run in a shell conditional statement.
9121
9186
  m4_define([_AC_COMPILER_EXEEXT],
9122
9187
  m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
9123
9188
 
9124
-
9125
9189
  # When config.status generates a header, we must update the stamp-h file.
9126
9190
  # This file resides in the same directory as the config header
9127
9191
  # that is generated. The stamp files are numbered to have different names.
@@ -9143,21 +9207,18 @@ for _am_header in $config_headers :; do
9143
9207
  done
9144
9208
  echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
9145
9209
 
9146
- # Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
9147
- # Inc.
9210
+ # Copyright (C) 2001-2014 Free Software Foundation, Inc.
9148
9211
  #
9149
9212
  # This file is free software; the Free Software Foundation
9150
9213
  # gives unlimited permission to copy and/or distribute it,
9151
9214
  # with or without modifications, as long as this notice is preserved.
9152
9215
 
9153
- # serial 1
9154
-
9155
9216
  # AM_PROG_INSTALL_SH
9156
9217
  # ------------------
9157
9218
  # Define $install_sh.
9158
9219
  AC_DEFUN([AM_PROG_INSTALL_SH],
9159
9220
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
9160
- if test x"${install_sh}" != xset; then
9221
+ if test x"${install_sh+set}" != xset; then
9161
9222
  case $am_aux_dir in
9162
9223
  *\ * | *\ *)
9163
9224
  install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -9165,16 +9226,14 @@ if test x"${install_sh}" != xset; then
9165
9226
  install_sh="\${SHELL} $am_aux_dir/install-sh"
9166
9227
  esac
9167
9228
  fi
9168
- AC_SUBST(install_sh)])
9229
+ AC_SUBST([install_sh])])
9169
9230
 
9170
- # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
9231
+ # Copyright (C) 2003-2014 Free Software Foundation, Inc.
9171
9232
  #
9172
9233
  # This file is free software; the Free Software Foundation
9173
9234
  # gives unlimited permission to copy and/or distribute it,
9174
9235
  # with or without modifications, as long as this notice is preserved.
9175
9236
 
9176
- # serial 2
9177
-
9178
9237
  # Check whether the underlying file-system supports filenames
9179
9238
  # with a leading dot. For instance MS-DOS doesn't.
9180
9239
  AC_DEFUN([AM_SET_LEADING_DOT],
@@ -9191,20 +9250,17 @@ AC_SUBST([am__leading_dot])])
9191
9250
  # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
9192
9251
  # From Jim Meyering
9193
9252
 
9194
- # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
9195
- # 2011 Free Software Foundation, Inc.
9253
+ # Copyright (C) 1996-2014 Free Software Foundation, Inc.
9196
9254
  #
9197
9255
  # This file is free software; the Free Software Foundation
9198
9256
  # gives unlimited permission to copy and/or distribute it,
9199
9257
  # with or without modifications, as long as this notice is preserved.
9200
9258
 
9201
- # serial 5
9202
-
9203
9259
  # AM_MAINTAINER_MODE([DEFAULT-MODE])
9204
9260
  # ----------------------------------
9205
9261
  # Control maintainer-specific portions of Makefiles.
9206
- # Default is to disable them, unless `enable' is passed literally.
9207
- # For symmetry, `disable' may be passed as well. Anyway, the user
9262
+ # Default is to disable them, unless 'enable' is passed literally.
9263
+ # For symmetry, 'disable' may be passed as well. Anyway, the user
9208
9264
  # can override the default with the --enable/--disable switch.
9209
9265
  AC_DEFUN([AM_MAINTAINER_MODE],
9210
9266
  [m4_case(m4_default([$1], [disable]),
@@ -9215,10 +9271,11 @@ AC_DEFUN([AM_MAINTAINER_MODE],
9215
9271
  AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
9216
9272
  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
9217
9273
  AC_ARG_ENABLE([maintainer-mode],
9218
- [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
9219
- (and sometimes confusing) to the casual installer],
9220
- [USE_MAINTAINER_MODE=$enableval],
9221
- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
9274
+ [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
9275
+ am_maintainer_other[ make rules and dependencies not useful
9276
+ (and sometimes confusing) to the casual installer])],
9277
+ [USE_MAINTAINER_MODE=$enableval],
9278
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
9222
9279
  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
9223
9280
  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
9224
9281
  MAINT=$MAINTAINER_MODE_TRUE
@@ -9226,18 +9283,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
9226
9283
  ]
9227
9284
  )
9228
9285
 
9229
- AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
9230
-
9231
9286
  # Check to see how 'make' treats includes. -*- Autoconf -*-
9232
9287
 
9233
- # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
9288
+ # Copyright (C) 2001-2014 Free Software Foundation, Inc.
9234
9289
  #
9235
9290
  # This file is free software; the Free Software Foundation
9236
9291
  # gives unlimited permission to copy and/or distribute it,
9237
9292
  # with or without modifications, as long as this notice is preserved.
9238
9293
 
9239
- # serial 4
9240
-
9241
9294
  # AM_MAKE_INCLUDE()
9242
9295
  # -----------------
9243
9296
  # Check to see how make treats includes.
@@ -9255,7 +9308,7 @@ am__quote=
9255
9308
  _am_result=none
9256
9309
  # First try GNU make style include.
9257
9310
  echo "include confinc" > confmf
9258
- # Ignore all kinds of additional output from `make'.
9311
+ # Ignore all kinds of additional output from 'make'.
9259
9312
  case `$am_make -s -f confmf 2> /dev/null` in #(
9260
9313
  *the\ am__doit\ target*)
9261
9314
  am__include=include
@@ -9282,15 +9335,12 @@ rm -f confinc confmf
9282
9335
 
9283
9336
  # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
9284
9337
 
9285
- # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
9286
- # Free Software Foundation, Inc.
9338
+ # Copyright (C) 1997-2014 Free Software Foundation, Inc.
9287
9339
  #
9288
9340
  # This file is free software; the Free Software Foundation
9289
9341
  # gives unlimited permission to copy and/or distribute it,
9290
9342
  # with or without modifications, as long as this notice is preserved.
9291
9343
 
9292
- # serial 6
9293
-
9294
9344
  # AM_MISSING_PROG(NAME, PROGRAM)
9295
9345
  # ------------------------------
9296
9346
  AC_DEFUN([AM_MISSING_PROG],
@@ -9298,11 +9348,10 @@ AC_DEFUN([AM_MISSING_PROG],
9298
9348
  $1=${$1-"${am_missing_run}$2"}
9299
9349
  AC_SUBST($1)])
9300
9350
 
9301
-
9302
9351
  # AM_MISSING_HAS_RUN
9303
9352
  # ------------------
9304
- # Define MISSING if not defined so far and test if it supports --run.
9305
- # If it does, set am_missing_run to use it, otherwise, to nothing.
9353
+ # Define MISSING if not defined so far and test if it is modern enough.
9354
+ # If it is, set am_missing_run to use it, otherwise, to nothing.
9306
9355
  AC_DEFUN([AM_MISSING_HAS_RUN],
9307
9356
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
9308
9357
  AC_REQUIRE_AUX_FILE([missing])dnl
@@ -9315,54 +9364,22 @@ if test x"${MISSING+set}" != xset; then
9315
9364
  esac
9316
9365
  fi
9317
9366
  # Use eval to expand $SHELL
9318
- if eval "$MISSING --run true"; then
9319
- am_missing_run="$MISSING --run "
9367
+ if eval "$MISSING --is-lightweight"; then
9368
+ am_missing_run="$MISSING "
9320
9369
  else
9321
9370
  am_missing_run=
9322
- AC_MSG_WARN([`missing' script is too old or missing])
9371
+ AC_MSG_WARN(['missing' script is too old or missing])
9323
9372
  fi
9324
9373
  ])
9325
9374
 
9326
- # Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
9327
- # Inc.
9328
- #
9329
- # This file is free software; the Free Software Foundation
9330
- # gives unlimited permission to copy and/or distribute it,
9331
- # with or without modifications, as long as this notice is preserved.
9332
-
9333
- # serial 1
9334
-
9335
- # AM_PROG_MKDIR_P
9336
- # ---------------
9337
- # Check for `mkdir -p'.
9338
- AC_DEFUN([AM_PROG_MKDIR_P],
9339
- [AC_PREREQ([2.60])dnl
9340
- AC_REQUIRE([AC_PROG_MKDIR_P])dnl
9341
- dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
9342
- dnl while keeping a definition of mkdir_p for backward compatibility.
9343
- dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
9344
- dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
9345
- dnl Makefile.ins that do not define MKDIR_P, so we do our own
9346
- dnl adjustment using top_builddir (which is defined more often than
9347
- dnl MKDIR_P).
9348
- AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
9349
- case $mkdir_p in
9350
- [[\\/$]]* | ?:[[\\/]]*) ;;
9351
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
9352
- esac
9353
- ])
9354
-
9355
9375
  # Helper functions for option handling. -*- Autoconf -*-
9356
9376
 
9357
- # Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
9358
- # Foundation, Inc.
9377
+ # Copyright (C) 2001-2014 Free Software Foundation, Inc.
9359
9378
  #
9360
9379
  # This file is free software; the Free Software Foundation
9361
9380
  # gives unlimited permission to copy and/or distribute it,
9362
9381
  # with or without modifications, as long as this notice is preserved.
9363
9382
 
9364
- # serial 5
9365
-
9366
9383
  # _AM_MANGLE_OPTION(NAME)
9367
9384
  # -----------------------
9368
9385
  AC_DEFUN([_AM_MANGLE_OPTION],
@@ -9372,7 +9389,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
9372
9389
  # --------------------
9373
9390
  # Set option NAME. Presently that only means defining a flag for this option.
9374
9391
  AC_DEFUN([_AM_SET_OPTION],
9375
- [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
9392
+ [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
9376
9393
 
9377
9394
  # _AM_SET_OPTIONS(OPTIONS)
9378
9395
  # ------------------------
@@ -9386,24 +9403,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
9386
9403
  AC_DEFUN([_AM_IF_OPTION],
9387
9404
  [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
9388
9405
 
9389
- # Check to make sure that the build environment is sane. -*- Autoconf -*-
9406
+ # Copyright (C) 1999-2014 Free Software Foundation, Inc.
9407
+ #
9408
+ # This file is free software; the Free Software Foundation
9409
+ # gives unlimited permission to copy and/or distribute it,
9410
+ # with or without modifications, as long as this notice is preserved.
9390
9411
 
9391
- # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
9392
- # Free Software Foundation, Inc.
9412
+ # _AM_PROG_CC_C_O
9413
+ # ---------------
9414
+ # Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
9415
+ # to automatically call this.
9416
+ AC_DEFUN([_AM_PROG_CC_C_O],
9417
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
9418
+ AC_REQUIRE_AUX_FILE([compile])dnl
9419
+ AC_LANG_PUSH([C])dnl
9420
+ AC_CACHE_CHECK(
9421
+ [whether $CC understands -c and -o together],
9422
+ [am_cv_prog_cc_c_o],
9423
+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
9424
+ # Make sure it works both with $CC and with simple cc.
9425
+ # Following AC_PROG_CC_C_O, we do the test twice because some
9426
+ # compilers refuse to overwrite an existing .o file with -o,
9427
+ # though they will create one.
9428
+ am_cv_prog_cc_c_o=yes
9429
+ for am_i in 1 2; do
9430
+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
9431
+ && test -f conftest2.$ac_objext; then
9432
+ : OK
9433
+ else
9434
+ am_cv_prog_cc_c_o=no
9435
+ break
9436
+ fi
9437
+ done
9438
+ rm -f core conftest*
9439
+ unset am_i])
9440
+ if test "$am_cv_prog_cc_c_o" != yes; then
9441
+ # Losing compiler, so override with the script.
9442
+ # FIXME: It is wrong to rewrite CC.
9443
+ # But if we don't then we get into trouble of one sort or another.
9444
+ # A longer-term fix would be to have automake use am__CC in this case,
9445
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
9446
+ CC="$am_aux_dir/compile $CC"
9447
+ fi
9448
+ AC_LANG_POP([C])])
9449
+
9450
+ # For backward compatibility.
9451
+ AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
9452
+
9453
+ # Copyright (C) 2001-2014 Free Software Foundation, Inc.
9393
9454
  #
9394
9455
  # This file is free software; the Free Software Foundation
9395
9456
  # gives unlimited permission to copy and/or distribute it,
9396
9457
  # with or without modifications, as long as this notice is preserved.
9397
9458
 
9398
- # serial 5
9459
+ # AM_RUN_LOG(COMMAND)
9460
+ # -------------------
9461
+ # Run COMMAND, save the exit status in ac_status, and log it.
9462
+ # (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
9463
+ AC_DEFUN([AM_RUN_LOG],
9464
+ [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
9465
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
9466
+ ac_status=$?
9467
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
9468
+ (exit $ac_status); }])
9469
+
9470
+ # Check to make sure that the build environment is sane. -*- Autoconf -*-
9471
+
9472
+ # Copyright (C) 1996-2014 Free Software Foundation, Inc.
9473
+ #
9474
+ # This file is free software; the Free Software Foundation
9475
+ # gives unlimited permission to copy and/or distribute it,
9476
+ # with or without modifications, as long as this notice is preserved.
9399
9477
 
9400
9478
  # AM_SANITY_CHECK
9401
9479
  # ---------------
9402
9480
  AC_DEFUN([AM_SANITY_CHECK],
9403
9481
  [AC_MSG_CHECKING([whether build environment is sane])
9404
- # Just in case
9405
- sleep 1
9406
- echo timestamp > conftest.file
9407
9482
  # Reject unsafe characters in $srcdir or the absolute working directory
9408
9483
  # name. Accept space and tab only in the latter.
9409
9484
  am_lf='
@@ -9414,32 +9489,40 @@ case `pwd` in
9414
9489
  esac
9415
9490
  case $srcdir in
9416
9491
  *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
9417
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
9492
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
9418
9493
  esac
9419
9494
 
9420
- # Do `set' in a subshell so we don't clobber the current shell's
9495
+ # Do 'set' in a subshell so we don't clobber the current shell's
9421
9496
  # arguments. Must try -L first in case configure is actually a
9422
9497
  # symlink; some systems play weird games with the mod time of symlinks
9423
9498
  # (eg FreeBSD returns the mod time of the symlink's containing
9424
9499
  # directory).
9425
9500
  if (
9426
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
9427
- if test "$[*]" = "X"; then
9428
- # -L didn't work.
9429
- set X `ls -t "$srcdir/configure" conftest.file`
9430
- fi
9431
- rm -f conftest.file
9432
- if test "$[*]" != "X $srcdir/configure conftest.file" \
9433
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
9434
-
9435
- # If neither matched, then we have a broken ls. This can happen
9436
- # if, for instance, CONFIG_SHELL is bash and it inherits a
9437
- # broken ls alias from the environment. This has actually
9438
- # happened. Such a system could not be considered "sane".
9439
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
9440
- alias in your environment])
9441
- fi
9442
-
9501
+ am_has_slept=no
9502
+ for am_try in 1 2; do
9503
+ echo "timestamp, slept: $am_has_slept" > conftest.file
9504
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
9505
+ if test "$[*]" = "X"; then
9506
+ # -L didn't work.
9507
+ set X `ls -t "$srcdir/configure" conftest.file`
9508
+ fi
9509
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
9510
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
9511
+
9512
+ # If neither matched, then we have a broken ls. This can happen
9513
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
9514
+ # broken ls alias from the environment. This has actually
9515
+ # happened. Such a system could not be considered "sane".
9516
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
9517
+ alias in your environment])
9518
+ fi
9519
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
9520
+ break
9521
+ fi
9522
+ # Just in case.
9523
+ sleep 1
9524
+ am_has_slept=yes
9525
+ done
9443
9526
  test "$[2]" = conftest.file
9444
9527
  )
9445
9528
  then
@@ -9449,46 +9532,118 @@ else
9449
9532
  AC_MSG_ERROR([newly created file is older than distributed files!
9450
9533
  Check your system clock])
9451
9534
  fi
9452
- AC_MSG_RESULT(yes)])
9535
+ AC_MSG_RESULT([yes])
9536
+ # If we didn't sleep, we still need to ensure time stamps of config.status and
9537
+ # generated files are strictly newer.
9538
+ am_sleep_pid=
9539
+ if grep 'slept: no' conftest.file >/dev/null 2>&1; then
9540
+ ( sleep 1 ) &
9541
+ am_sleep_pid=$!
9542
+ fi
9543
+ AC_CONFIG_COMMANDS_PRE(
9544
+ [AC_MSG_CHECKING([that generated files are newer than configure])
9545
+ if test -n "$am_sleep_pid"; then
9546
+ # Hide warnings about reused PIDs.
9547
+ wait $am_sleep_pid 2>/dev/null
9548
+ fi
9549
+ AC_MSG_RESULT([done])])
9550
+ rm -f conftest.file
9551
+ ])
9453
9552
 
9454
- # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
9553
+ # Copyright (C) 2009-2014 Free Software Foundation, Inc.
9455
9554
  #
9456
9555
  # This file is free software; the Free Software Foundation
9457
9556
  # gives unlimited permission to copy and/or distribute it,
9458
9557
  # with or without modifications, as long as this notice is preserved.
9459
9558
 
9460
- # serial 1
9559
+ # AM_SILENT_RULES([DEFAULT])
9560
+ # --------------------------
9561
+ # Enable less verbose build rules; with the default set to DEFAULT
9562
+ # ("yes" being less verbose, "no" or empty being verbose).
9563
+ AC_DEFUN([AM_SILENT_RULES],
9564
+ [AC_ARG_ENABLE([silent-rules], [dnl
9565
+ AS_HELP_STRING(
9566
+ [--enable-silent-rules],
9567
+ [less verbose build output (undo: "make V=1")])
9568
+ AS_HELP_STRING(
9569
+ [--disable-silent-rules],
9570
+ [verbose build output (undo: "make V=0")])dnl
9571
+ ])
9572
+ case $enable_silent_rules in @%:@ (((
9573
+ yes) AM_DEFAULT_VERBOSITY=0;;
9574
+ no) AM_DEFAULT_VERBOSITY=1;;
9575
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
9576
+ esac
9577
+ dnl
9578
+ dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
9579
+ dnl do not support nested variable expansions.
9580
+ dnl See automake bug#9928 and bug#10237.
9581
+ am_make=${MAKE-make}
9582
+ AC_CACHE_CHECK([whether $am_make supports nested variables],
9583
+ [am_cv_make_support_nested_variables],
9584
+ [if AS_ECHO([['TRUE=$(BAR$(V))
9585
+ BAR0=false
9586
+ BAR1=true
9587
+ V=1
9588
+ am__doit:
9589
+ @$(TRUE)
9590
+ .PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
9591
+ am_cv_make_support_nested_variables=yes
9592
+ else
9593
+ am_cv_make_support_nested_variables=no
9594
+ fi])
9595
+ if test $am_cv_make_support_nested_variables = yes; then
9596
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
9597
+ AM_V='$(V)'
9598
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
9599
+ else
9600
+ AM_V=$AM_DEFAULT_VERBOSITY
9601
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
9602
+ fi
9603
+ AC_SUBST([AM_V])dnl
9604
+ AM_SUBST_NOTMAKE([AM_V])dnl
9605
+ AC_SUBST([AM_DEFAULT_V])dnl
9606
+ AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
9607
+ AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
9608
+ AM_BACKSLASH='\'
9609
+ AC_SUBST([AM_BACKSLASH])dnl
9610
+ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
9611
+ ])
9612
+
9613
+ # Copyright (C) 2001-2014 Free Software Foundation, Inc.
9614
+ #
9615
+ # This file is free software; the Free Software Foundation
9616
+ # gives unlimited permission to copy and/or distribute it,
9617
+ # with or without modifications, as long as this notice is preserved.
9461
9618
 
9462
9619
  # AM_PROG_INSTALL_STRIP
9463
9620
  # ---------------------
9464
- # One issue with vendor `install' (even GNU) is that you can't
9621
+ # One issue with vendor 'install' (even GNU) is that you can't
9465
9622
  # specify the program used to strip binaries. This is especially
9466
9623
  # annoying in cross-compiling environments, where the build's strip
9467
9624
  # is unlikely to handle the host's binaries.
9468
9625
  # Fortunately install-sh will honor a STRIPPROG variable, so we
9469
- # always use install-sh in `make install-strip', and initialize
9626
+ # always use install-sh in "make install-strip", and initialize
9470
9627
  # STRIPPROG with the value of the STRIP variable (set by the user).
9471
9628
  AC_DEFUN([AM_PROG_INSTALL_STRIP],
9472
9629
  [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
9473
- # Installed binaries are usually stripped using `strip' when the user
9474
- # run `make install-strip'. However `strip' might not be the right
9630
+ # Installed binaries are usually stripped using 'strip' when the user
9631
+ # run "make install-strip". However 'strip' might not be the right
9475
9632
  # tool to use in cross-compilation environments, therefore Automake
9476
- # will honor the `STRIP' environment variable to overrule this program.
9477
- dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
9633
+ # will honor the 'STRIP' environment variable to overrule this program.
9634
+ dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
9478
9635
  if test "$cross_compiling" != no; then
9479
9636
  AC_CHECK_TOOL([STRIP], [strip], :)
9480
9637
  fi
9481
9638
  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
9482
9639
  AC_SUBST([INSTALL_STRIP_PROGRAM])])
9483
9640
 
9484
- # Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
9641
+ # Copyright (C) 2006-2014 Free Software Foundation, Inc.
9485
9642
  #
9486
9643
  # This file is free software; the Free Software Foundation
9487
9644
  # gives unlimited permission to copy and/or distribute it,
9488
9645
  # with or without modifications, as long as this notice is preserved.
9489
9646
 
9490
- # serial 3
9491
-
9492
9647
  # _AM_SUBST_NOTMAKE(VARIABLE)
9493
9648
  # ---------------------------
9494
9649
  # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -9502,18 +9657,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
9502
9657
 
9503
9658
  # Check how to create a tarball. -*- Autoconf -*-
9504
9659
 
9505
- # Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
9660
+ # Copyright (C) 2004-2014 Free Software Foundation, Inc.
9506
9661
  #
9507
9662
  # This file is free software; the Free Software Foundation
9508
9663
  # gives unlimited permission to copy and/or distribute it,
9509
9664
  # with or without modifications, as long as this notice is preserved.
9510
9665
 
9511
- # serial 2
9512
-
9513
9666
  # _AM_PROG_TAR(FORMAT)
9514
9667
  # --------------------
9515
9668
  # Check how to create a tarball in format FORMAT.
9516
- # FORMAT should be one of `v7', `ustar', or `pax'.
9669
+ # FORMAT should be one of 'v7', 'ustar', or 'pax'.
9517
9670
  #
9518
9671
  # Substitute a variable $(am__tar) that is a command
9519
9672
  # writing to stdout a FORMAT-tarball containing the directory
@@ -9523,76 +9676,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
9523
9676
  # Substitute a variable $(am__untar) that extract such
9524
9677
  # a tarball read from stdin.
9525
9678
  # $(am__untar) < result.tar
9679
+ #
9526
9680
  AC_DEFUN([_AM_PROG_TAR],
9527
9681
  [# Always define AMTAR for backward compatibility. Yes, it's still used
9528
9682
  # in the wild :-( We should find a proper way to deprecate it ...
9529
9683
  AC_SUBST([AMTAR], ['$${TAR-tar}'])
9530
- m4_if([$1], [v7],
9531
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
9532
- [m4_case([$1], [ustar],, [pax],,
9533
- [m4_fatal([Unknown tar format])])
9534
- AC_MSG_CHECKING([how to create a $1 tar archive])
9535
- # Loop over all known methods to create a tar archive until one works.
9684
+
9685
+ # We'll loop over all known methods to create a tar archive until one works.
9536
9686
  _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
9537
- _am_tools=${am_cv_prog_tar_$1-$_am_tools}
9538
- # Do not fold the above two line into one, because Tru64 sh and
9539
- # Solaris sh will not grok spaces in the rhs of `-'.
9540
- for _am_tool in $_am_tools
9541
- do
9542
- case $_am_tool in
9543
- gnutar)
9544
- for _am_tar in tar gnutar gtar;
9545
- do
9546
- AM_RUN_LOG([$_am_tar --version]) && break
9547
- done
9548
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
9549
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
9550
- am__untar="$_am_tar -xf -"
9551
- ;;
9552
- plaintar)
9553
- # Must skip GNU tar: if it does not support --format= it doesn't create
9554
- # ustar tarball either.
9555
- (tar --version) >/dev/null 2>&1 && continue
9556
- am__tar='tar chf - "$$tardir"'
9557
- am__tar_='tar chf - "$tardir"'
9558
- am__untar='tar xf -'
9559
- ;;
9560
- pax)
9561
- am__tar='pax -L -x $1 -w "$$tardir"'
9562
- am__tar_='pax -L -x $1 -w "$tardir"'
9563
- am__untar='pax -r'
9564
- ;;
9565
- cpio)
9566
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
9567
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
9568
- am__untar='cpio -i -H $1 -d'
9569
- ;;
9570
- none)
9571
- am__tar=false
9572
- am__tar_=false
9573
- am__untar=false
9574
- ;;
9575
- esac
9576
9687
 
9577
- # If the value was cached, stop now. We just wanted to have am__tar
9578
- # and am__untar set.
9579
- test -n "${am_cv_prog_tar_$1}" && break
9688
+ m4_if([$1], [v7],
9689
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
9690
+
9691
+ [m4_case([$1],
9692
+ [ustar],
9693
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
9694
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
9695
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
9696
+ # and bug#13588).
9697
+ am_max_uid=2097151 # 2^21 - 1
9698
+ am_max_gid=$am_max_uid
9699
+ # The $UID and $GID variables are not portable, so we need to resort
9700
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
9701
+ # below are definitely unexpected, so allow the users to see them
9702
+ # (that is, avoid stderr redirection).
9703
+ am_uid=`id -u || echo unknown`
9704
+ am_gid=`id -g || echo unknown`
9705
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
9706
+ if test $am_uid -le $am_max_uid; then
9707
+ AC_MSG_RESULT([yes])
9708
+ else
9709
+ AC_MSG_RESULT([no])
9710
+ _am_tools=none
9711
+ fi
9712
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
9713
+ if test $am_gid -le $am_max_gid; then
9714
+ AC_MSG_RESULT([yes])
9715
+ else
9716
+ AC_MSG_RESULT([no])
9717
+ _am_tools=none
9718
+ fi],
9719
+
9720
+ [pax],
9721
+ [],
9580
9722
 
9581
- # tar/untar a dummy directory, and stop if the command works
9582
- rm -rf conftest.dir
9583
- mkdir conftest.dir
9584
- echo GrepMe > conftest.dir/file
9585
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
9723
+ [m4_fatal([Unknown tar format])])
9724
+
9725
+ AC_MSG_CHECKING([how to create a $1 tar archive])
9726
+
9727
+ # Go ahead even if we have the value already cached. We do so because we
9728
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
9729
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
9730
+
9731
+ for _am_tool in $_am_tools; do
9732
+ case $_am_tool in
9733
+ gnutar)
9734
+ for _am_tar in tar gnutar gtar; do
9735
+ AM_RUN_LOG([$_am_tar --version]) && break
9736
+ done
9737
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
9738
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
9739
+ am__untar="$_am_tar -xf -"
9740
+ ;;
9741
+ plaintar)
9742
+ # Must skip GNU tar: if it does not support --format= it doesn't create
9743
+ # ustar tarball either.
9744
+ (tar --version) >/dev/null 2>&1 && continue
9745
+ am__tar='tar chf - "$$tardir"'
9746
+ am__tar_='tar chf - "$tardir"'
9747
+ am__untar='tar xf -'
9748
+ ;;
9749
+ pax)
9750
+ am__tar='pax -L -x $1 -w "$$tardir"'
9751
+ am__tar_='pax -L -x $1 -w "$tardir"'
9752
+ am__untar='pax -r'
9753
+ ;;
9754
+ cpio)
9755
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
9756
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
9757
+ am__untar='cpio -i -H $1 -d'
9758
+ ;;
9759
+ none)
9760
+ am__tar=false
9761
+ am__tar_=false
9762
+ am__untar=false
9763
+ ;;
9764
+ esac
9765
+
9766
+ # If the value was cached, stop now. We just wanted to have am__tar
9767
+ # and am__untar set.
9768
+ test -n "${am_cv_prog_tar_$1}" && break
9769
+
9770
+ # tar/untar a dummy directory, and stop if the command works.
9771
+ rm -rf conftest.dir
9772
+ mkdir conftest.dir
9773
+ echo GrepMe > conftest.dir/file
9774
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
9775
+ rm -rf conftest.dir
9776
+ if test -s conftest.tar; then
9777
+ AM_RUN_LOG([$am__untar <conftest.tar])
9778
+ AM_RUN_LOG([cat conftest.dir/file])
9779
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
9780
+ fi
9781
+ done
9586
9782
  rm -rf conftest.dir
9587
- if test -s conftest.tar; then
9588
- AM_RUN_LOG([$am__untar <conftest.tar])
9589
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
9590
- fi
9591
- done
9592
- rm -rf conftest.dir
9593
9783
 
9594
- AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
9595
- AC_MSG_RESULT([$am_cv_prog_tar_$1])])
9784
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
9785
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
9786
+
9596
9787
  AC_SUBST([am__tar])
9597
9788
  AC_SUBST([am__untar])
9598
9789
  ]) # _AM_PROG_TAR