|
@@ -1,7 +1,8 @@
|
|
|
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
|
|
|
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
|
|
|
|
|
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
|
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
|
|
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
|
|
|
+# Inc.
|
|
|
# This file is free software; the Free Software Foundation
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -13,18 +14,21 @@
|
|
|
|
|
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
|
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
|
|
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
|
|
|
-[m4_warning([this file was generated for autoconf 2.67.
|
|
|
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
|
|
|
+[m4_warning([this file was generated for autoconf 2.69.
|
|
|
You have another version of autoconf. It may work, but is not guaranteed to.
|
|
|
If you have problems, you may need to regenerate the build system entirely.
|
|
|
To do so, use the procedure documented by the package, typically `autoreconf'.])])
|
|
|
|
|
|
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
|
|
|
+# Foundation, Inc.
|
|
|
#
|
|
|
# This file is free software; the Free Software Foundation
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
+# serial 1
|
|
|
+
|
|
|
# AM_AUTOMAKE_VERSION(VERSION)
|
|
|
# ----------------------------
|
|
|
# Automake X.Y traces this macro to ensure aclocal.m4 has been
|
|
@@ -34,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
|
|
|
[am__api_version='1.11'
|
|
|
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
|
|
dnl require some minimum version. Point them to the right macro.
|
|
|
-m4_if([$1], [1.11.1], [],
|
|
|
+m4_if([$1], [1.11.6], [],
|
|
|
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
|
|
])
|
|
|
|
|
@@ -50,19 +54,82 @@ m4_define([_AM_AUTOCONF_VERSION], [])
|
|
|
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
|
|
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
|
|
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
|
|
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
|
|
|
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
|
|
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
|
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
|
|
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
|
|
|
|
|
+# Copyright (C) 2011 Free Software Foundation, Inc.
|
|
|
+#
|
|
|
+# This file is free software; the Free Software Foundation
|
|
|
+# gives unlimited permission to copy and/or distribute it,
|
|
|
+# with or without modifications, as long as this notice is preserved.
|
|
|
+
|
|
|
+# serial 1
|
|
|
+
|
|
|
+# AM_PROG_AR([ACT-IF-FAIL])
|
|
|
+# -------------------------
|
|
|
+# Try to determine the archiver interface, and trigger the ar-lib wrapper
|
|
|
+# if it is needed. If the detection of archiver interface fails, run
|
|
|
+# ACT-IF-FAIL (default is to abort configure with a proper error message).
|
|
|
+AC_DEFUN([AM_PROG_AR],
|
|
|
+[AC_BEFORE([$0], [LT_INIT])dnl
|
|
|
+AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
|
|
|
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
|
+AC_REQUIRE_AUX_FILE([ar-lib])dnl
|
|
|
+AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
|
|
|
+: ${AR=ar}
|
|
|
+
|
|
|
+AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
|
|
|
+ [am_cv_ar_interface=ar
|
|
|
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
|
|
|
+ [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
|
|
|
+ AC_TRY_EVAL([am_ar_try])
|
|
|
+ if test "$ac_status" -eq 0; then
|
|
|
+ am_cv_ar_interface=ar
|
|
|
+ else
|
|
|
+ am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
|
|
|
+ AC_TRY_EVAL([am_ar_try])
|
|
|
+ if test "$ac_status" -eq 0; then
|
|
|
+ am_cv_ar_interface=lib
|
|
|
+ else
|
|
|
+ am_cv_ar_interface=unknown
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ rm -f conftest.lib libconftest.a
|
|
|
+ ])
|
|
|
+ ])
|
|
|
+
|
|
|
+case $am_cv_ar_interface in
|
|
|
+ar)
|
|
|
+ ;;
|
|
|
+lib)
|
|
|
+ # Microsoft lib, so override with the ar-lib wrapper script.
|
|
|
+ # FIXME: It is wrong to rewrite AR.
|
|
|
+ # But if we don't then we get into trouble of one sort or another.
|
|
|
+ # A longer-term fix would be to have automake use am__AR in this case,
|
|
|
+ # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
|
|
|
+ # similar.
|
|
|
+ AR="$am_aux_dir/ar-lib $AR"
|
|
|
+ ;;
|
|
|
+unknown)
|
|
|
+ m4_default([$1],
|
|
|
+ [AC_MSG_ERROR([could not determine $AR interface])])
|
|
|
+ ;;
|
|
|
+esac
|
|
|
+AC_SUBST([AR])dnl
|
|
|
+])
|
|
|
+
|
|
|
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
|
|
|
#
|
|
|
# This file is free software; the Free Software Foundation
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
+# serial 1
|
|
|
+
|
|
|
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
|
|
|
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
|
|
|
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
|
|
@@ -144,14 +211,14 @@ AC_CONFIG_COMMANDS_PRE(
|
|
|
Usually this means the macro was only invoked conditionally.]])
|
|
|
fi])])
|
|
|
|
|
|
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
|
|
|
-# Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
|
|
|
+# 2010, 2011 Free Software Foundation, Inc.
|
|
|
#
|
|
|
# This file is free software; the Free Software Foundation
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
-# serial 10
|
|
|
+# serial 12
|
|
|
|
|
|
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
|
|
|
# written in clear, in which case automake, when reading aclocal.m4,
|
|
@@ -191,6 +258,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|
|
# instance it was reported that on HP-UX the gcc test will end up
|
|
|
# making a dummy file named `D' -- because `-MD' means `put the output
|
|
|
# in D'.
|
|
|
+ rm -rf conftest.dir
|
|
|
mkdir conftest.dir
|
|
|
# Copy depcomp to subdir because otherwise we won't find it if we're
|
|
|
# using a relative directory.
|
|
@@ -255,7 +323,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|
|
break
|
|
|
fi
|
|
|
;;
|
|
|
- msvisualcpp | msvcmsys)
|
|
|
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
|
|
|
# This compiler won't grok `-c -o', but also, the minuso test has
|
|
|
# not run yet. These depmodes are late enough in the game, and
|
|
|
# so weak that their functioning should not be impacted.
|
|
@@ -320,10 +388,13 @@ AC_DEFUN([AM_DEP_TRACK],
|
|
|
if test "x$enable_dependency_tracking" != xno; then
|
|
|
am_depcomp="$ac_aux_dir/depcomp"
|
|
|
AMDEPBACKSLASH='\'
|
|
|
+ am__nodep='_no'
|
|
|
fi
|
|
|
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
|
|
|
AC_SUBST([AMDEPBACKSLASH])dnl
|
|
|
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
|
|
|
+AC_SUBST([am__nodep])dnl
|
|
|
+_AM_SUBST_NOTMAKE([am__nodep])dnl
|
|
|
])
|
|
|
|
|
|
# Generate code to set up dependency tracking. -*- Autoconf -*-
|
|
@@ -545,12 +616,15 @@ for _am_header in $config_headers :; do
|
|
|
done
|
|
|
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
|
|
|
|
|
|
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
|
|
|
+# Inc.
|
|
|
#
|
|
|
# This file is free software; the Free Software Foundation
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
+# serial 1
|
|
|
+
|
|
|
# AM_PROG_INSTALL_SH
|
|
|
# ------------------
|
|
|
# Define $install_sh.
|
|
@@ -682,12 +756,15 @@ else
|
|
|
fi
|
|
|
])
|
|
|
|
|
|
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
|
|
|
+# Inc.
|
|
|
#
|
|
|
# This file is free software; the Free Software Foundation
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
+# serial 1
|
|
|
+
|
|
|
# AM_PROG_MKDIR_P
|
|
|
# ---------------
|
|
|
# Check for `mkdir -p'.
|
|
@@ -710,13 +787,14 @@ esac
|
|
|
|
|
|
# Helper functions for option handling. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
|
|
|
+# Foundation, Inc.
|
|
|
#
|
|
|
# This file is free software; the Free Software Foundation
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
-# serial 4
|
|
|
+# serial 5
|
|
|
|
|
|
# _AM_MANGLE_OPTION(NAME)
|
|
|
# -----------------------
|
|
@@ -724,13 +802,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
|
|
|
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
|
|
|
|
|
|
# _AM_SET_OPTION(NAME)
|
|
|
-# ------------------------------
|
|
|
+# --------------------
|
|
|
# Set option NAME. Presently that only means defining a flag for this option.
|
|
|
AC_DEFUN([_AM_SET_OPTION],
|
|
|
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
|
|
|
|
|
|
# _AM_SET_OPTIONS(OPTIONS)
|
|
|
-# ----------------------------------
|
|
|
+# ------------------------
|
|
|
# OPTIONS is a space-separated list of Automake options.
|
|
|
AC_DEFUN([_AM_SET_OPTIONS],
|
|
|
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
|
|
@@ -752,6 +830,8 @@ AC_DEFUN([_AM_IF_OPTION],
|
|
|
|
|
|
AC_DEFUN([AM_C_PROTOTYPES],
|
|
|
[AC_REQUIRE([AC_C_PROTOTYPES])
|
|
|
+AC_DIAGNOSE([obsolete],
|
|
|
+ [$0: automatic de-ANSI-fication support is deprecated])
|
|
|
if test "$ac_cv_prog_cc_stdc" != no; then
|
|
|
U= ANSI2KNR=
|
|
|
else
|
|
@@ -832,13 +912,13 @@ Check your system clock])
|
|
|
fi
|
|
|
AC_MSG_RESULT(yes)])
|
|
|
|
|
|
-# Copyright (C) 2009 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
|
|
|
#
|
|
|
# This file is free software; the Free Software Foundation
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
-# serial 1
|
|
|
+# serial 2
|
|
|
|
|
|
# AM_SILENT_RULES([DEFAULT])
|
|
|
# --------------------------
|
|
@@ -853,18 +933,50 @@ yes) AM_DEFAULT_VERBOSITY=0;;
|
|
|
no) AM_DEFAULT_VERBOSITY=1;;
|
|
|
*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
|
|
|
esac
|
|
|
+dnl
|
|
|
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
|
|
|
+dnl do not support nested variable expansions.
|
|
|
+dnl See automake bug#9928 and bug#10237.
|
|
|
+am_make=${MAKE-make}
|
|
|
+AC_CACHE_CHECK([whether $am_make supports nested variables],
|
|
|
+ [am_cv_make_support_nested_variables],
|
|
|
+ [if AS_ECHO([['TRUE=$(BAR$(V))
|
|
|
+BAR0=false
|
|
|
+BAR1=true
|
|
|
+V=1
|
|
|
+am__doit:
|
|
|
+ @$(TRUE)
|
|
|
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
|
|
|
+ am_cv_make_support_nested_variables=yes
|
|
|
+else
|
|
|
+ am_cv_make_support_nested_variables=no
|
|
|
+fi])
|
|
|
+if test $am_cv_make_support_nested_variables = yes; then
|
|
|
+ dnl Using `$V' instead of `$(V)' breaks IRIX make.
|
|
|
+ AM_V='$(V)'
|
|
|
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
|
|
|
+else
|
|
|
+ AM_V=$AM_DEFAULT_VERBOSITY
|
|
|
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
|
|
|
+fi
|
|
|
+AC_SUBST([AM_V])dnl
|
|
|
+AM_SUBST_NOTMAKE([AM_V])dnl
|
|
|
+AC_SUBST([AM_DEFAULT_V])dnl
|
|
|
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
|
|
|
AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
|
|
|
AM_BACKSLASH='\'
|
|
|
AC_SUBST([AM_BACKSLASH])dnl
|
|
|
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
|
|
|
])
|
|
|
|
|
|
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
|
|
|
#
|
|
|
# This file is free software; the Free Software Foundation
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
+# serial 1
|
|
|
+
|
|
|
# AM_PROG_INSTALL_STRIP
|
|
|
# ---------------------
|
|
|
# One issue with vendor `install' (even GNU) is that you can't
|
|
@@ -887,13 +999,13 @@ fi
|
|
|
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
|
|
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
|
|
|
|
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
|
|
|
#
|
|
|
# This file is free software; the Free Software Foundation
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
-# serial 2
|
|
|
+# serial 3
|
|
|
|
|
|
# _AM_SUBST_NOTMAKE(VARIABLE)
|
|
|
# ---------------------------
|
|
@@ -902,13 +1014,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
|
AC_DEFUN([_AM_SUBST_NOTMAKE])
|
|
|
|
|
|
# AM_SUBST_NOTMAKE(VARIABLE)
|
|
|
-# ---------------------------
|
|
|
+# --------------------------
|
|
|
# Public sister of _AM_SUBST_NOTMAKE.
|
|
|
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
|
|
|
|
|
# Check how to create a tarball. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
|
|
|
#
|
|
|
# This file is free software; the Free Software Foundation
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -930,10 +1042,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
|
|
# a tarball read from stdin.
|
|
|
# $(am__untar) < result.tar
|
|
|
AC_DEFUN([_AM_PROG_TAR],
|
|
|
-[# Always define AMTAR for backward compatibility.
|
|
|
-AM_MISSING_PROG([AMTAR], [tar])
|
|
|
+[# Always define AMTAR for backward compatibility. Yes, it's still used
|
|
|
+# in the wild :-( We should find a proper way to deprecate it ...
|
|
|
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
|
|
|
m4_if([$1], [v7],
|
|
|
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
|
|
|
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
|
|
|
[m4_case([$1], [ustar],, [pax],,
|
|
|
[m4_fatal([Unknown tar format])])
|
|
|
AC_MSG_CHECKING([how to create a $1 tar archive])
|