summaryrefslogtreecommitdiffstats
path: root/vppinfra/configure
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2015-12-15 13:20:55 +0000
committerGerrit Code Review <gerrit@projectrotterdam.info>2015-12-15 13:20:55 +0000
commitec65a1afd3f118849a7629d99ab2a1dcd2dda341 (patch)
tree249f8c92d27b02a63fe844d107a42920d727836e /vppinfra/configure
parent5e7ac9dc825d06b30bfb970860ccc7a3f2696c6e (diff)
parent29b6af9f97b0002a4ba495eade7727c1ecb4f3c2 (diff)
Merge "Remove vppversion subtree, move elftool to vppinfra"
Diffstat (limited to 'vppinfra/configure')
-rwxr-xr-xvppinfra/configure13
1 files changed, 7 insertions, 6 deletions
diff --git a/vppinfra/configure b/vppinfra/configure
index 21bcba226c1..bb32295c0cf 100755
--- a/vppinfra/configure
+++ b/vppinfra/configure
@@ -2231,7 +2231,7 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2403,8 +2403,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2423,7 +2423,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2751,8 +2751,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -2809,6 +2809,7 @@ END
as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
fi
fi
+
# Check whether --enable-silent-rules was given.
if test "${enable_silent_rules+set}" = set; then :
enableval=$enable_silent_rules;