|
|
@@ -1,7 +1,7 @@
|
|
|
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
|
|
|
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
|
|
|
|
|
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
|
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
|
+# 2005, 2006, 2007, 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.
|
|
|
@@ -7977,10 +7977,10 @@ m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
|
|
|
# generated from the m4 files accompanying Automake X.Y.
|
|
|
# (This private macro should not be called outside this file.)
|
|
|
AC_DEFUN([AM_AUTOMAKE_VERSION],
|
|
|
-[am__api_version='1.10'
|
|
|
+[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.10.2], [],
|
|
|
+m4_if([$1], [1.11], [],
|
|
|
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
|
|
])
|
|
|
|
|
|
@@ -7996,7 +7996,7 @@ 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.10.2])dnl
|
|
|
+[AM_AUTOMAKE_VERSION([1.11])dnl
|
|
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
|
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
|
|
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
|
|
@@ -8056,14 +8056,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
|
|
|
|
# AM_CONDITIONAL -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
|
|
|
+# 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 8
|
|
|
+# serial 9
|
|
|
|
|
|
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
|
|
# -------------------------------------
|
|
|
@@ -8076,6 +8076,7 @@ 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='#'
|
|
|
@@ -8089,14 +8090,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
|
|
|
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 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 9
|
|
|
+# serial 10
|
|
|
|
|
|
# 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,
|
|
|
@@ -8153,6 +8154,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
|
|
|
@@ -8170,7 +8181,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
|
|
|
@@ -8180,19 +8201,23 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|
|
break
|
|
|
fi
|
|
|
;;
|
|
|
+ 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
|
|
|
@@ -8256,59 +8281,61 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
|
|
|
# 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_OUTPUT_DEPENDENCY_COMMANDS
|
|
|
# ------------------------------
|
|
|
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
|
-[# 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"
|
|
|
+[{
|
|
|
+ # 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
|
|
|
|
|
|
|
|
|
@@ -8368,13 +8395,13 @@ 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, 2006, 2008 Free Software Foundation, Inc.
|
|
|
+# 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 13
|
|
|
+# 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.
|
|
|
@@ -8391,7 +8418,7 @@ 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.60])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
|
|
|
@@ -8442,8 +8469,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.
|
|
|
@@ -8451,24 +8478,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_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
|
|
|
@@ -8491,7 +8531,7 @@ 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 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 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,
|
|
|
@@ -8502,7 +8542,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
|
|
|
# Define $install_sh.
|
|
|
AC_DEFUN([AM_PROG_INSTALL_SH],
|
|
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
|
-install_sh=${install_sh-"\$(SHELL) $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.
|
|
|
@@ -8529,27 +8576,38 @@ AC_SUBST([am__leading_dot])])
|
|
|
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
|
|
|
# From Jim Meyering
|
|
|
|
|
|
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
|
|
|
+# Copyright (C) 1996, 1998, 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 4
|
|
|
+# serial 5
|
|
|
|
|
|
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
|
|
|
+# ----------------------------------
|
|
|
+# Control maintainer-specific portions of Makefiles.
|
|
|
+# Default is to disable them, unless `enable' is passed literally.
|
|
|
+# For symmetry, `disable' may be passed as well. Anyway, the user
|
|
|
+# can override the default with the --enable/--disable switch.
|
|
|
AC_DEFUN([AM_MAINTAINER_MODE],
|
|
|
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
|
|
|
- dnl maintainer-mode is disabled by default
|
|
|
- AC_ARG_ENABLE(maintainer-mode,
|
|
|
-[ --enable-maintainer-mode enable make rules and dependencies not useful
|
|
|
+[m4_case(m4_default([$1], [disable]),
|
|
|
+ [enable], [m4_define([am_maintainer_other], [disable])],
|
|
|
+ [disable], [m4_define([am_maintainer_other], [enable])],
|
|
|
+ [m4_define([am_maintainer_other], [enable])
|
|
|
+ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
|
|
|
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
|
|
|
+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
|
|
|
+ AC_ARG_ENABLE([maintainer-mode],
|
|
|
+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
|
|
|
(and sometimes confusing) to the casual installer],
|
|
|
- USE_MAINTAINER_MODE=$enableval,
|
|
|
- USE_MAINTAINER_MODE=no)
|
|
|
+ [USE_MAINTAINER_MODE=$enableval],
|
|
|
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
|
|
|
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
|
|
|
- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
|
|
|
+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
|
|
|
MAINT=$MAINTAINER_MODE_TRUE
|
|
|
- AC_SUBST(MAINT)dnl
|
|
|
+ AC_SUBST([MAINT])dnl
|
|
|
]
|
|
|
)
|
|
|
|
|
|
@@ -8557,13 +8615,13 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
|
|
|
|
|
|
# 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()
|
|
|
# -----------------
|
|
|
@@ -8572,7 +8630,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.
|
|
|
@@ -8582,24 +8640,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])
|
|
|
@@ -8644,14 +8702,14 @@ m4_define([AC_PROG_CC],
|
|
|
|
|
|
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 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 5
|
|
|
+# serial 6
|
|
|
|
|
|
# AM_MISSING_PROG(NAME, PROGRAM)
|
|
|
# ------------------------------
|
|
|
@@ -8668,7 +8726,14 @@ AC_SUBST($1)])
|
|
|
AC_DEFUN([AM_MISSING_HAS_RUN],
|
|
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
|
AC_REQUIRE_AUX_FILE([missing])dnl
|
|
|
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
|
|
+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 "
|
|
|
@@ -8739,14 +8804,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
|
|
|
# ---------------
|
|
|
@@ -8755,16 +8820,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" \
|
|
|
@@ -8817,18 +8895,25 @@ fi
|
|
|
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
|
|
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
|
|
|
|
-# Copyright (C) 2006 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 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 2
|
|
|
+
|
|
|
# _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.
|
Aaron Turner