diff --git a/configure b/configure
index e7c62d1..ee20b29 100755
--- a/configure
+++ b/configure
@@ -746,6 +746,10 @@
MODULES_RELATIVE_PATH
MODULES_DIRNAME
MODULES_BASEDIRNAME
+LIB_BIN_DIR_PATH
+LIB_BIN_DIR_RELATIVE_PATH
+LIB_BIN_DIR
+LIB_BIN_BASEDIRNAME
LIBRARY_PATH
EXECUTABLE_PATH
INCLUDEARCH_PATH
@@ -3497,7 +3501,7 @@
ac_config_commands="$ac_config_commands MagickCore/magick-baseconfig.h"
-ac_config_files="$ac_config_files common.shi config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/Magick++.dox config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config MagickCore/ImageMagick.pc Magick++/lib/Magick++.pc MagickCore/MagickCore-config MagickCore/MagickCore.pc MagickCore/version.h Makefile magick.sh PerlMagick/check.sh PerlMagick/Makefile.PL PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm PerlMagick/quantum/quantum.xs PerlMagick/quantum/typemap PerlMagick/Magick.pm utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 MagickWand/MagickWand-config MagickWand/MagickWand.pc"
+ac_config_files="$ac_config_files common.shi config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/Magick++.dox config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config MagickCore/ImageMagick.pc Magick++/lib/Magick++.pc MagickCore/MagickCore-config MagickCore/MagickCore.pc MagickCore/version.h Makefile magick.sh PerlMagick/check.sh PerlMagick/default/Magick.pm PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm PerlMagick/quantum/quantum.xs PerlMagick/quantum/typemap utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 MagickWand/MagickWand-config MagickWand/MagickWand.pc"
#
@@ -3671,7 +3675,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=11231:11245M
+MAGICK_SVN_REVISION=11302M
# Substitute library versioning
@@ -8092,6 +8096,75 @@
$as_echo "no, using $LN_S" >&6; }
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ { ac_script=; unset ac_script;}
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_SED_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ fi
+else
+ ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
+
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -32399,6 +32472,28 @@
#
+# path to local binaries
+if test "x$LIB_BIN_BASEDIRNAME" = "x"; then
+ LIB_BIN_BASEDIRNAME="bin"
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define LIB_BIN_BASEDIRNAME "$LIB_BIN_BASEDIRNAME"
+_ACEOF
+
+
+
+if test "x$LIB_BIN_DIR" = "x"; then
+ LIB_BIN_DIR=${LIB_BIN_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
+fi
+
+
+LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR
+
+LIB_BIN_DIR_PATH="${LIBRARY_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}"
+
+
+#
# path to modules lib
if test "x$MODULES_BASEDIRNAME" = "x"; then
MODULES_BASEDIRNAME="modules"
@@ -36914,12 +37009,13 @@
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"magick.sh") CONFIG_FILES="$CONFIG_FILES magick.sh" ;;
"PerlMagick/check.sh") CONFIG_FILES="$CONFIG_FILES PerlMagick/check.sh" ;;
+ "PerlMagick/default/Magick.pm") CONFIG_FILES="$CONFIG_FILES PerlMagick/default/Magick.pm" ;;
"PerlMagick/Makefile.PL") CONFIG_FILES="$CONFIG_FILES PerlMagick/Makefile.PL" ;;
+ "PerlMagick/default/Makefile.PL") CONFIG_FILES="$CONFIG_FILES PerlMagick/default/Makefile.PL" ;;
"PerlMagick/quantum/Makefile.PL") CONFIG_FILES="$CONFIG_FILES PerlMagick/quantum/Makefile.PL" ;;
"PerlMagick/quantum/quantum.pm") CONFIG_FILES="$CONFIG_FILES PerlMagick/quantum/quantum.pm" ;;
"PerlMagick/quantum/quantum.xs") CONFIG_FILES="$CONFIG_FILES PerlMagick/quantum/quantum.xs" ;;
"PerlMagick/quantum/typemap") CONFIG_FILES="$CONFIG_FILES PerlMagick/quantum/typemap" ;;
- "PerlMagick/Magick.pm") CONFIG_FILES="$CONFIG_FILES PerlMagick/Magick.pm" ;;
"utilities/animate.1") CONFIG_FILES="$CONFIG_FILES utilities/animate.1" ;;
"utilities/compare.1") CONFIG_FILES="$CONFIG_FILES utilities/compare.1" ;;
"utilities/composite.1") CONFIG_FILES="$CONFIG_FILES utilities/composite.1" ;;