|
|
@@ -1,7 +1,8 @@
|
|
|
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
|
|
|
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
|
|
|
|
|
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
|
-# 2005 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.
|
|
|
@@ -11,33 +12,63 @@
|
|
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
|
# PARTICULAR PURPOSE.
|
|
|
|
|
|
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
|
|
|
+m4_ifndef([AC_AUTOCONF_VERSION],
|
|
|
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
|
|
+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, 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
|
|
|
# generated from the m4 files accompanying Automake X.Y.
|
|
|
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
|
|
|
+# (This private macro should not be called outside this file.)
|
|
|
+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.6], [],
|
|
|
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
|
|
+])
|
|
|
+
|
|
|
+# _AM_AUTOCONF_VERSION(VERSION)
|
|
|
+# -----------------------------
|
|
|
+# aclocal traces this macro to find the Autoconf version.
|
|
|
+# This is a private macro too. Using m4_define simplifies
|
|
|
+# the logic in aclocal, which can simply ignore this definition.
|
|
|
+m4_define([_AM_AUTOCONF_VERSION], [])
|
|
|
|
|
|
# AM_SET_CURRENT_AUTOMAKE_VERSION
|
|
|
# -------------------------------
|
|
|
-# Call AM_AUTOMAKE_VERSION so it can be traced.
|
|
|
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
|
|
+# 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.9.6])])
|
|
|
+[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]))])
|
|
|
|
|
|
# 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/../..'.
|
|
|
@@ -85,14 +116,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
|
|
|
|
# AM_CONDITIONAL -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
|
|
|
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
|
|
|
# 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 7
|
|
|
+# serial 9
|
|
|
|
|
|
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
|
|
# -------------------------------------
|
|
|
@@ -101,8 +132,11 @@ AC_DEFUN([AM_CONDITIONAL],
|
|
|
[AC_PREREQ(2.52)dnl
|
|
|
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
|
|
|
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
|
|
|
-AC_SUBST([$1_TRUE])
|
|
|
-AC_SUBST([$1_FALSE])
|
|
|
+AC_SUBST([$1_TRUE])dnl
|
|
|
+AC_SUBST([$1_FALSE])dnl
|
|
|
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
|
|
|
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
|
|
|
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
|
|
|
if $2; then
|
|
|
$1_TRUE=
|
|
|
$1_FALSE='#'
|
|
|
@@ -116,15 +150,14 @@ AC_CONFIG_COMMANDS_PRE(
|
|
|
Usually this means the macro was only invoked conditionally.]])
|
|
|
fi])])
|
|
|
|
|
|
-
|
|
|
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
|
-# 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 8
|
|
|
+# 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,
|
|
|
@@ -152,6 +185,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
|
|
|
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
|
|
|
[$1], CXX, [depcc="$CXX" am_compiler_list=],
|
|
|
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
|
|
|
+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
|
|
|
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
|
|
|
[depcc="$$1" am_compiler_list=])
|
|
|
|
|
|
@@ -163,6 +197,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.
|
|
|
@@ -180,6 +215,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|
|
if test "$am_compiler_list" = ""; then
|
|
|
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
|
|
|
fi
|
|
|
+ am__universal=false
|
|
|
+ m4_case([$1], [CC],
|
|
|
+ [case " $depcc " in #(
|
|
|
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
|
|
|
+ esac],
|
|
|
+ [CXX],
|
|
|
+ [case " $depcc " in #(
|
|
|
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
|
|
|
+ esac])
|
|
|
+
|
|
|
for depmode in $am_compiler_list; do
|
|
|
# Setup a source with many dependencies, because some compilers
|
|
|
# like to wrap large dependency lists on column 80 (with \), and
|
|
|
@@ -197,7 +242,17 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|
|
done
|
|
|
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
|
|
|
|
|
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
|
|
+ # mode. It turns out that the SunPro C++ compiler does not properly
|
|
|
+ # handle `-M -o', and we need to detect this. Also, some Intel
|
|
|
+ # versions had trouble with output in subdirs
|
|
|
+ am__obj=sub/conftest.${OBJEXT-o}
|
|
|
+ am__minus_obj="-o $am__obj"
|
|
|
case $depmode in
|
|
|
+ gcc)
|
|
|
+ # This depmode causes a compiler race in universal mode.
|
|
|
+ test "$am__universal" = false || continue
|
|
|
+ ;;
|
|
|
nosideeffect)
|
|
|
# after this tag, mechanisms are not by side-effect, so they'll
|
|
|
# only be used when explicitly requested
|
|
|
@@ -207,18 +262,23 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|
|
break
|
|
|
fi
|
|
|
;;
|
|
|
+ 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.
|
|
|
+ am__obj=conftest.${OBJEXT-o}
|
|
|
+ am__minus_obj=
|
|
|
+ ;;
|
|
|
none) break ;;
|
|
|
esac
|
|
|
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
|
|
- # mode. It turns out that the SunPro C++ compiler does not properly
|
|
|
- # handle `-M -o', and we need to detect this.
|
|
|
if depmode=$depmode \
|
|
|
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
|
|
|
+ source=sub/conftest.c object=$am__obj \
|
|
|
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
|
|
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
|
|
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
|
|
|
>/dev/null 2>conftest.err &&
|
|
|
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
|
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
|
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
|
|
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
|
|
|
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
|
|
# icc doesn't choke on unknown options, it will just issue warnings
|
|
|
# or remarks (even with -Werror). So we grep stderr for any message
|
|
|
@@ -267,63 +327,79 @@ 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])
|
|
|
+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 -*-
|
|
|
|
|
|
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
|
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
|
|
|
# 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 3
|
|
|
+#serial 5
|
|
|
|
|
|
# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
|
|
# ------------------------------
|
|
|
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
|
-[for mf in $CONFIG_FILES; do
|
|
|
- # Strip MF so we end up with the name of the file.
|
|
|
- mf=`echo "$mf" | sed -e 's/:.*$//'`
|
|
|
- # Check whether this is an Automake generated Makefile or not.
|
|
|
- # We used to match only the files named `Makefile.in', but
|
|
|
- # some people rename them; so instead we look at the file content.
|
|
|
- # Grep'ing the first line is not enough: some people post-process
|
|
|
- # each Makefile.in and add a new line on top of each file to say so.
|
|
|
- # So let's grep whole file.
|
|
|
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
|
|
|
- dirpart=`AS_DIRNAME("$mf")`
|
|
|
- else
|
|
|
- continue
|
|
|
- fi
|
|
|
- # Extract the definition of DEPDIR, am__include, and am__quote
|
|
|
- # from the Makefile without running `make'.
|
|
|
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
|
|
- test -z "$DEPDIR" && continue
|
|
|
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
|
|
- test -z "am__include" && continue
|
|
|
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
|
|
- # When using ansi2knr, U may be empty or an underscore; expand it
|
|
|
- U=`sed -n 's/^U = //p' < "$mf"`
|
|
|
- # Find all dependency output files, they are included files with
|
|
|
- # $(DEPDIR) in their names. We invoke sed twice because it is the
|
|
|
- # simplest approach to changing $(DEPDIR) to its actual value in the
|
|
|
- # expansion.
|
|
|
- for file in `sed -n "
|
|
|
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
|
|
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
|
|
- # Make sure the directory exists.
|
|
|
- test -f "$dirpart/$file" && continue
|
|
|
- fdir=`AS_DIRNAME(["$file"])`
|
|
|
- AS_MKDIR_P([$dirpart/$fdir])
|
|
|
- # echo "creating $dirpart/$file"
|
|
|
- echo '# dummy' > "$dirpart/$file"
|
|
|
+[{
|
|
|
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
|
|
|
+ # are listed without --file. Let's play safe and only enable the eval
|
|
|
+ # if we detect the quoting.
|
|
|
+ case $CONFIG_FILES in
|
|
|
+ *\'*) eval set x "$CONFIG_FILES" ;;
|
|
|
+ *) set x $CONFIG_FILES ;;
|
|
|
+ esac
|
|
|
+ shift
|
|
|
+ for mf
|
|
|
+ do
|
|
|
+ # Strip MF so we end up with the name of the file.
|
|
|
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
|
|
|
+ # Check whether this is an Automake generated Makefile or not.
|
|
|
+ # We used to match only the files named `Makefile.in', but
|
|
|
+ # some people rename them; so instead we look at the file content.
|
|
|
+ # Grep'ing the first line is not enough: some people post-process
|
|
|
+ # each Makefile.in and add a new line on top of each file to say so.
|
|
|
+ # Grep'ing the whole file is not good either: AIX grep has a line
|
|
|
+ # limit of 2048, but all sed's we know have understand at least 4000.
|
|
|
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
|
|
+ dirpart=`AS_DIRNAME("$mf")`
|
|
|
+ else
|
|
|
+ continue
|
|
|
+ fi
|
|
|
+ # Extract the definition of DEPDIR, am__include, and am__quote
|
|
|
+ # from the Makefile without running `make'.
|
|
|
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
|
|
+ test -z "$DEPDIR" && continue
|
|
|
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
|
|
+ test -z "am__include" && continue
|
|
|
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
|
|
+ # When using ansi2knr, U may be empty or an underscore; expand it
|
|
|
+ U=`sed -n 's/^U = //p' < "$mf"`
|
|
|
+ # Find all dependency output files, they are included files with
|
|
|
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
|
|
|
+ # simplest approach to changing $(DEPDIR) to its actual value in the
|
|
|
+ # expansion.
|
|
|
+ for file in `sed -n "
|
|
|
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
|
|
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
|
|
+ # Make sure the directory exists.
|
|
|
+ test -f "$dirpart/$file" && continue
|
|
|
+ fdir=`AS_DIRNAME(["$file"])`
|
|
|
+ AS_MKDIR_P([$dirpart/$fdir])
|
|
|
+ # echo "creating $dirpart/$file"
|
|
|
+ echo '# dummy' > "$dirpart/$file"
|
|
|
+ done
|
|
|
done
|
|
|
-done
|
|
|
+}
|
|
|
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
|
|
|
|
|
|
|
|
@@ -354,14 +430,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
|
|
|
|
|
|
# Do all the work for Automake. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
|
-# Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
|
+# 2005, 2006, 2008, 2009 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 12
|
|
|
+# serial 16
|
|
|
|
|
|
# This macro actually does too much. Some checks are only needed if
|
|
|
# your package does certain things. But this isn't really a big deal.
|
|
|
@@ -378,16 +454,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
|
|
|
# arguments mandatory, and then we can depend on a new Autoconf
|
|
|
# release and drop the old call support.
|
|
|
AC_DEFUN([AM_INIT_AUTOMAKE],
|
|
|
-[AC_PREREQ([2.58])dnl
|
|
|
+[AC_PREREQ([2.62])dnl
|
|
|
dnl Autoconf wants to disallow AM_ names. We explicitly allow
|
|
|
dnl the ones we care about.
|
|
|
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
|
|
|
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
|
|
|
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
|
-# test to see if srcdir already configured
|
|
|
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
|
|
|
- test -f $srcdir/config.status; then
|
|
|
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
|
|
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
|
|
|
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
|
|
|
+ # is not polluted with repeated "-I."
|
|
|
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
|
|
|
+ # test to see if srcdir already configured
|
|
|
+ if test -f $srcdir/config.status; then
|
|
|
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
|
|
+ fi
|
|
|
fi
|
|
|
|
|
|
# test whether we have cygpath
|
|
|
@@ -407,6 +487,9 @@ m4_ifval([$2],
|
|
|
AC_SUBST([PACKAGE], [$1])dnl
|
|
|
AC_SUBST([VERSION], [$2])],
|
|
|
[_AM_SET_OPTIONS([$1])dnl
|
|
|
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
|
|
|
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
|
|
|
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
|
|
|
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
|
|
|
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
|
|
|
|
|
|
@@ -422,8 +505,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
|
|
|
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
|
|
|
AM_MISSING_PROG(AUTOHEADER, autoheader)
|
|
|
AM_MISSING_PROG(MAKEINFO, makeinfo)
|
|
|
-AM_PROG_INSTALL_SH
|
|
|
-AM_PROG_INSTALL_STRIP
|
|
|
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
|
|
|
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
|
|
|
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
|
|
|
# We need awk for the "check" target. The system "awk" is bad on
|
|
|
# some platforms.
|
|
|
@@ -431,20 +514,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl
|
|
|
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
|
|
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
|
|
|
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
|
|
|
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
|
|
|
- [_AM_PROG_TAR([v7])])])
|
|
|
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
|
|
|
+ [_AM_PROG_TAR([v7])])])
|
|
|
_AM_IF_OPTION([no-dependencies],,
|
|
|
[AC_PROVIDE_IFELSE([AC_PROG_CC],
|
|
|
- [_AM_DEPENDENCIES(CC)],
|
|
|
- [define([AC_PROG_CC],
|
|
|
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
|
|
|
+ [_AM_DEPENDENCIES(CC)],
|
|
|
+ [define([AC_PROG_CC],
|
|
|
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
|
|
|
AC_PROVIDE_IFELSE([AC_PROG_CXX],
|
|
|
- [_AM_DEPENDENCIES(CXX)],
|
|
|
- [define([AC_PROG_CXX],
|
|
|
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
|
|
+ [_AM_DEPENDENCIES(CXX)],
|
|
|
+ [define([AC_PROG_CXX],
|
|
|
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
|
|
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
|
|
|
+ [_AM_DEPENDENCIES(OBJC)],
|
|
|
+ [define([AC_PROG_OBJC],
|
|
|
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
|
|
|
])
|
|
|
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
|
|
|
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
|
|
|
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
|
|
|
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
|
|
|
+AC_CONFIG_COMMANDS_PRE(dnl
|
|
|
+[m4_provide_if([_AM_COMPILER_EXEEXT],
|
|
|
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
|
|
|
])
|
|
|
|
|
|
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
|
|
|
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
|
|
|
+dnl mangled by Autoconf and run in a shell conditional statement.
|
|
|
+m4_define([_AC_COMPILER_EXEEXT],
|
|
|
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
|
|
|
+
|
|
|
|
|
|
# When config.status generates a header, we must update the stamp-h file.
|
|
|
# This file resides in the same directory as the config header
|
|
|
@@ -455,29 +555,40 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
|
|
|
# our stamp files there.
|
|
|
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
|
|
|
[# Compute $1's index in $config_headers.
|
|
|
+_am_arg=$1
|
|
|
_am_stamp_count=1
|
|
|
for _am_header in $config_headers :; do
|
|
|
case $_am_header in
|
|
|
- $1 | $1:* )
|
|
|
+ $_am_arg | $_am_arg:* )
|
|
|
break ;;
|
|
|
* )
|
|
|
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
|
|
|
esac
|
|
|
done
|
|
|
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
|
|
|
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
|
|
|
|
|
|
-# Copyright (C) 2001, 2003, 2005 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.
|
|
|
AC_DEFUN([AM_PROG_INSTALL_SH],
|
|
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
|
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
|
|
|
+if test x"${install_sh}" != xset; then
|
|
|
+ case $am_aux_dir in
|
|
|
+ *\ * | *\ *)
|
|
|
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
|
|
+ *)
|
|
|
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
|
|
|
+ esac
|
|
|
+fi
|
|
|
AC_SUBST(install_sh)])
|
|
|
|
|
|
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
|
|
@@ -503,13 +614,13 @@ AC_SUBST([am__leading_dot])])
|
|
|
|
|
|
# Check to see how 'make' treats includes. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 2001, 2002, 2003, 2005, 2009 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 3
|
|
|
+# serial 4
|
|
|
|
|
|
# AM_MAKE_INCLUDE()
|
|
|
# -----------------
|
|
|
@@ -518,7 +629,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
|
|
|
[am_make=${MAKE-make}
|
|
|
cat > confinc << 'END'
|
|
|
am__doit:
|
|
|
- @echo done
|
|
|
+ @echo this is the am__doit target
|
|
|
.PHONY: am__doit
|
|
|
END
|
|
|
# If we don't find an include directive, just comment out the code.
|
|
|
@@ -528,24 +639,24 @@ am__quote=
|
|
|
_am_result=none
|
|
|
# First try GNU make style include.
|
|
|
echo "include confinc" > confmf
|
|
|
-# We grep out `Entering directory' and `Leaving directory'
|
|
|
-# messages which can occur if `w' ends up in MAKEFLAGS.
|
|
|
-# In particular we don't look at `^make:' because GNU make might
|
|
|
-# be invoked under some other name (usually "gmake"), in which
|
|
|
-# case it prints its new name instead of `make'.
|
|
|
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
|
|
|
- am__include=include
|
|
|
- am__quote=
|
|
|
- _am_result=GNU
|
|
|
-fi
|
|
|
+# Ignore all kinds of additional output from `make'.
|
|
|
+case `$am_make -s -f confmf 2> /dev/null` in #(
|
|
|
+*the\ am__doit\ target*)
|
|
|
+ am__include=include
|
|
|
+ am__quote=
|
|
|
+ _am_result=GNU
|
|
|
+ ;;
|
|
|
+esac
|
|
|
# Now try BSD make style include.
|
|
|
if test "$am__include" = "#"; then
|
|
|
echo '.include "confinc"' > confmf
|
|
|
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
|
|
|
- am__include=.include
|
|
|
- am__quote="\""
|
|
|
- _am_result=BSD
|
|
|
- fi
|
|
|
+ case `$am_make -s -f confmf 2> /dev/null` in #(
|
|
|
+ *the\ am__doit\ target*)
|
|
|
+ am__include=.include
|
|
|
+ am__quote="\""
|
|
|
+ _am_result=BSD
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
fi
|
|
|
AC_SUBST([am__include])
|
|
|
AC_SUBST([am__quote])
|
|
|
@@ -555,14 +666,14 @@ rm -f confinc confmf
|
|
|
|
|
|
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
|
|
|
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
|
|
|
# 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 6
|
|
|
|
|
|
# AM_MISSING_PROG(NAME, PROGRAM)
|
|
|
# ------------------------------
|
|
|
@@ -578,7 +689,15 @@ AC_SUBST($1)])
|
|
|
# If it does, set am_missing_run to use it, otherwise, to nothing.
|
|
|
AC_DEFUN([AM_MISSING_HAS_RUN],
|
|
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
|
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
|
|
+AC_REQUIRE_AUX_FILE([missing])dnl
|
|
|
+if test x"${MISSING+set}" != xset; then
|
|
|
+ case $am_aux_dir in
|
|
|
+ *\ * | *\ *)
|
|
|
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
|
|
|
+ *)
|
|
|
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
|
|
|
+ esac
|
|
|
+fi
|
|
|
# Use eval to expand $SHELL
|
|
|
if eval "$MISSING --run true"; then
|
|
|
am_missing_run="$MISSING --run "
|
|
|
@@ -588,78 +707,45 @@ else
|
|
|
fi
|
|
|
])
|
|
|
|
|
|
-# Copyright (C) 2003, 2004, 2005 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 whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
|
|
|
-#
|
|
|
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
|
|
|
-# created by `make install' are always world readable, even if the
|
|
|
-# installer happens to have an overly restrictive umask (e.g. 077).
|
|
|
-# This was a mistake. There are at least two reasons why we must not
|
|
|
-# use `-m 0755':
|
|
|
-# - it causes special bits like SGID to be ignored,
|
|
|
-# - it may be too restrictive (some setups expect 775 directories).
|
|
|
-#
|
|
|
-# Do not use -m 0755 and let people choose whatever they expect by
|
|
|
-# setting umask.
|
|
|
-#
|
|
|
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
|
|
|
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
|
|
|
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
|
|
|
-# concurrently, both version can detect that a/ is missing, but only
|
|
|
-# one can create it and the other will error out. Consequently we
|
|
|
-# restrict ourselves to GNU make (using the --version option ensures
|
|
|
-# this.)
|
|
|
+# Check for `mkdir -p'.
|
|
|
AC_DEFUN([AM_PROG_MKDIR_P],
|
|
|
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
|
|
|
- # We used to keeping the `.' as first argument, in order to
|
|
|
- # allow $(mkdir_p) to be used without argument. As in
|
|
|
- # $(mkdir_p) $(somedir)
|
|
|
- # where $(somedir) is conditionally defined. However this is wrong
|
|
|
- # for two reasons:
|
|
|
- # 1. if the package is installed by a user who cannot write `.'
|
|
|
- # make install will fail,
|
|
|
- # 2. the above comment should most certainly read
|
|
|
- # $(mkdir_p) $(DESTDIR)$(somedir)
|
|
|
- # so it does not work when $(somedir) is undefined and
|
|
|
- # $(DESTDIR) is not.
|
|
|
- # To support the latter case, we have to write
|
|
|
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
|
|
|
- # so the `.' trick is pointless.
|
|
|
- mkdir_p='mkdir -p --'
|
|
|
-else
|
|
|
- # On NextStep and OpenStep, the `mkdir' command does not
|
|
|
- # recognize any option. It will interpret all options as
|
|
|
- # directories to create, and then abort because `.' already
|
|
|
- # exists.
|
|
|
- for d in ./-p ./--version;
|
|
|
- do
|
|
|
- test -d $d && rmdir $d
|
|
|
- done
|
|
|
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
|
|
|
- if test -f "$ac_aux_dir/mkinstalldirs"; then
|
|
|
- mkdir_p='$(mkinstalldirs)'
|
|
|
- else
|
|
|
- mkdir_p='$(install_sh) -d'
|
|
|
- fi
|
|
|
-fi
|
|
|
-AC_SUBST([mkdir_p])])
|
|
|
+[AC_PREREQ([2.60])dnl
|
|
|
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
|
|
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
|
|
|
+dnl while keeping a definition of mkdir_p for backward compatibility.
|
|
|
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
|
|
|
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
|
|
|
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
|
|
|
+dnl adjustment using top_builddir (which is defined more often than
|
|
|
+dnl MKDIR_P).
|
|
|
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
|
|
|
+case $mkdir_p in
|
|
|
+ [[\\/$]]* | ?:[[\\/]]*) ;;
|
|
|
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
|
|
|
+esac
|
|
|
+])
|
|
|
|
|
|
# Helper functions for option handling. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 2001, 2002, 2003, 2005 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 3
|
|
|
+# serial 5
|
|
|
|
|
|
# _AM_MANGLE_OPTION(NAME)
|
|
|
# -----------------------
|
|
|
@@ -667,16 +753,16 @@ 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],
|
|
|
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
|
|
|
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
|
|
|
|
|
|
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
|
|
|
# -------------------------------------------
|
|
|
@@ -686,14 +772,14 @@ AC_DEFUN([_AM_IF_OPTION],
|
|
|
|
|
|
# Check to make sure that the build environment is sane. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
|
|
|
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
|
|
|
# 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_SANITY_CHECK
|
|
|
# ---------------
|
|
|
@@ -702,16 +788,29 @@ AC_DEFUN([AM_SANITY_CHECK],
|
|
|
# Just in case
|
|
|
sleep 1
|
|
|
echo timestamp > conftest.file
|
|
|
+# Reject unsafe characters in $srcdir or the absolute working directory
|
|
|
+# name. Accept space and tab only in the latter.
|
|
|
+am_lf='
|
|
|
+'
|
|
|
+case `pwd` in
|
|
|
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
|
|
|
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
|
|
|
+esac
|
|
|
+case $srcdir in
|
|
|
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
|
|
|
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
|
|
|
+esac
|
|
|
+
|
|
|
# Do `set' in a subshell so we don't clobber the current shell's
|
|
|
# arguments. Must try -L first in case configure is actually a
|
|
|
# symlink; some systems play weird games with the mod time of symlinks
|
|
|
# (eg FreeBSD returns the mod time of the symlink's containing
|
|
|
# directory).
|
|
|
if (
|
|
|
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
|
|
|
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
|
|
|
if test "$[*]" = "X"; then
|
|
|
# -L didn't work.
|
|
|
- set X `ls -t $srcdir/configure conftest.file`
|
|
|
+ set X `ls -t "$srcdir/configure" conftest.file`
|
|
|
fi
|
|
|
rm -f conftest.file
|
|
|
if test "$[*]" != "X $srcdir/configure conftest.file" \
|
|
|
@@ -736,12 +835,14 @@ Check your system clock])
|
|
|
fi
|
|
|
AC_MSG_RESULT(yes)])
|
|
|
|
|
|
-# 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
|
|
|
@@ -761,12 +862,31 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
|
|
|
if test "$cross_compiling" != no; then
|
|
|
AC_CHECK_TOOL([STRIP], [strip], :)
|
|
|
fi
|
|
|
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
|
|
|
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
|
|
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
|
|
|
|
+# 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 3
|
|
|
+
|
|
|
+# _AM_SUBST_NOTMAKE(VARIABLE)
|
|
|
+# ---------------------------
|
|
|
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
|
|
|
+# This macro is traced by Automake.
|
|
|
+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,
|
|
|
@@ -788,10 +908,11 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
|
# 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])
|
James Cameron