diff --git a/configure b/configure
index 84cc6f5..a88c1b0 100755
--- a/configure
+++ b/configure
@@ -3658,7 +3658,7 @@
program_prefix=${target_alias}-
-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
@@ -3830,8 +3830,8 @@
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
@@ -3850,7 +3850,7 @@
$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'" ;;
@@ -4178,8 +4178,8 @@
# <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}'
@@ -4236,6 +4236,7 @@
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;
@@ -4341,7 +4342,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=18685M
+MAGICK_SVN_REVISION=18723M
# Substitute library versioning
@@ -36398,6 +36399,7 @@
if test "$have_zlib" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES zlib"
fi
+
# Remove extraneous spaces from output variables (asthetic)
MAGICK_DELEGATES=`echo $MAGICK_DELEGATES | sed -e 's/ */ /g'`
MAGICK_FEATURES=`echo $MAGICK_FEATURES | sed -e 's/ */ /g'`
@@ -36541,22 +36543,28 @@
#
-# Remove extraneous spaces from output variables (asthetic)
+# Sanitize output variables (asthetic).
#
-X_CFLAGS=`echo $X_CFLAGS | sed -e 's/ */ /g'`
-X_PRE_LIBS=`echo $X_PRE_LIBS | sed -e 's/ */ /g'`
-X_LIBS=`echo $X_LIBS | sed -e 's/ */ /g'`
-X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed -e 's/ */ /g'`
-
-CC=`echo $CC | sed -e 's/ */ /g'`
-CFLAGS=`echo $CFLAGS | sed -e 's/ */ /g'`
-CPPFLAGS=`echo $CPPFLAGS | sed -e 's/ */ /g'`
-CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ */ /g'`
-DISTCHECK_CONFIG_FLAGS=`echo $DISTCHECK_CONFIG_FLAGS | sed -e 's/ */ /g'`
-LDFLAGS=`echo $LDFLAGS | sed -e 's/ */ /g'`
-TESTED_LIBS=`echo $LIBS | sed -e 's/ */ /g'`
-MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/ */ /g'`
-#LIBS=`echo $LIBS | sed -e 's/ */ /g'`
+for variable in CC CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MAGICK_DEP_LIBS TESTED_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS; do
+ sanitize=''
+ eval value=$`echo $variable`
+ for component in $value
+ do
+ unique=yes
+ for test_component in $sanitize
+ do
+ if test $component = $test_component; then
+ unique=no
+ break
+ fi
+ done
+ if test $unique = yes; then
+ sanitize="$sanitize $component"
+ fi
+ done
+ sanitize=`echo $sanitize | sed -e 's/^ *//g'`
+ eval ${variable}=\${sanitize}
+done
# Pass only user-provided LIBS as "global" libraries
LIBS=$USER_LIBS