Magick++/Makefile.am

@@ -137,7 +137,9 @@ endif
 
 Magick___lib_libMagick___la_LDFLAGS = -no-undefined \
   $(Magick___lib_libMagick___la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \
-	-version-info $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
+  -release $(MAGICK_ABISUFFIX) \
+  -version-info \
+  $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
 Magick___lib_libMagick___la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 
 MAGICKPP_CHECK_PGRMS_OPT = \

Magick++/lib/ImageMagick++.pc.in

@@ -6,7 +6,7 @@ includedir=@includedir@/ImageMagick
 
 Name: ImageMagick++
 Version: @PACKAGE_VERSION@
-Description: Magick++ - C++ API for ImageMagick
+Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABISUFFIX@)
 Requires: ImageMagick
-Libs: -L${libdir} -lMagick++
+Libs: -L${libdir} -lMagick++-@MAGICK_ABISUFFIX@
 Cflags: -I${includedir}

Magick++/lib/Magick++.pc.in

@@ -8,5 +8,5 @@ Name: Magick++
 Version: @PACKAGE_VERSION@
 Description: Magick++ - C++ API for ImageMagick
 Requires: ImageMagick
-Libs: -L${libdir} -lMagick++
+Libs: -L${libdir} -lMagick++-@MAGICK_ABISUFFIX@
 Cflags: -I${includedir}

MagickCore/ImageMagick.pc.in

@@ -4,7 +4,7 @@ libdir=@libdir@
 includedir=@includedir@/ImageMagick
 
 Name: ImageMagick
-Description: ImageMagick - Convert, Edit, and Compose Images
+Description: ImageMagick - Convert, Edit, and Compose Images (ABI @MAGICK_ABISUFFIX@)
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lMagickCore
+Libs: -L${libdir} -lMagickCore-@MAGICK_ABISUFFIX@
 Cflags: -I${includedir} @MAGICK_PCFLAGS@

MagickCore/MagickCore.pc.in

@@ -4,7 +4,7 @@ libdir=@libdir@
 includedir=@includedir@/ImageMagick
 
 Name: MagickCore
-Description: MagickCore - C API for ImageMagick
+Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABISUFFIX@)
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lMagickCore
+Libs: -L${libdir} -lMagickCore-@MAGICK_ABISUFFIX@
 Cflags: -I${includedir} @MAGICK_PCFLAGS@

MagickCore/Makefile.am

@@ -348,6 +348,7 @@ MAGICKCORE_INCLUDE_HDRS = \
 	MagickCore/magic-private.h \
 	MagickCore/magick.h \
 	MagickCore/magick-config.h \
+	MagickCore/magick-baseconfig.h \
 	MagickCore/magick-type.h \
 	MagickCore/matrix.h \
 	MagickCore/memory_.h \
@@ -480,5 +481,5 @@ MagickCore-install-data-local:
 # Uninstall magick-config.h
 MAGICKCORE_UNINSTALL_LOCAL_TARGETS = MagickCore-uninstall-local
 MagickCore-uninstall-local:
-	rm -f $(DESTDIR)$(MagickCoreincdir)/magick-config.h
+	rm -f $(DESTDIR)$(MagickCoreincdir)/magick-baseconfig.h
 

MagickCore/studio.h

@@ -268,8 +268,6 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #  define IsBasenameSeparator(c) \
   (((c) == ']') || ((c) == ':') || ((c) == '/') ? MagickTrue : MagickFalse)
 #  define MAGICKCORE_LIBRARY_PATH  "sys$login:"
-#  define MAGICKCORE_CODER_PATH  "sys$login:"
-#  define MAGICKCORE_FILTER_PATH  "sys$login:"
 #  define MAGICKCORE_SHARE_PATH  "sys$login:"
 #  define X11_PREFERENCES_PATH  "decw$user_defaults:"
 #  define ProcessPendingEvents(text)
@@ -295,8 +293,6 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #  define EditorOptions ""
 #  define IsBasenameSeparator(c)  ((c) == ':' ? MagickTrue : MagickFalse)
 #  define MAGICKCORE_LIBRARY_PATH  ""
-#  define MAGICKCORE_CODER_PATH  ""
-#  define MAGICKCORE_FILTER_PATH  ""
 #  define MAGICKCORE_SHARE_PATH  ""
 #  define X11_PREFERENCES_PATH  "~/."
 #  if defined(DISABLE_SIOUX)

MagickCore/version.h

@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "10044:10059M"
+#define MagickSVNRevision  "10062:10071M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
-#define MagickLibVersionNumber  7,0,0
+#define MagickLibVersionNumber  10,0,0
 #define MagickLibAddendum  "-0"
-#define MagickLibInterface  7
-#define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-11-28"
+#define MagickLibInterface  10
+#define MagickLibMinInterface  10
+#define MagickReleaseDate  "2012-12-01"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

MagickWand/MagickWand.pc.in

@@ -5,7 +5,7 @@ includedir=@includedir@/ImageMagick
 
 Name: MagickWand
 Version: @PACKAGE_VERSION@
-Description:  MagickWand - C API for ImageMagick
+Description:  MagickWand - C API for ImageMagick (ABI @MAGICK_ABISUFFIX@)
 Requires: ImageMagick
-Libs: -L${libdir} -lMagickWand -lMagickCore
+Libs: -L${libdir} -lMagickWand-@MAGICK_ABISUFFIX@ -lMagickCore-@MAGICK_ABISUFFIX@
 Cflags: -I${includedir} @MAGICK_PCFLAGS@

MagickWand/studio.h

@@ -273,8 +273,6 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #  define IsBasenameSeparator(c) \
   (((c) == ']') || ((c) == ':') || ((c) == '/') ? MagickTrue : MagickFalse)
 #  define MAGICKCORE_LIBRARY_PATH  "sys$login:"
-#  define MAGICKCORE_CODER_PATH  "sys$login:"
-#  define MAGICKCORE_FILTER_PATH  "sys$login:"
 #  define MAGICKCORE_SHARE_PATH  "sys$login:"
 #  define X11_PREFERENCES_PATH  "decw$user_defaults:"
 #  define ProcessPendingEvents(text)
@@ -300,8 +298,6 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #  define EditorOptions ""
 #  define IsBasenameSeparator(c)  ((c) == ':' ? MagickTrue : MagickFalse)
 #  define MAGICKCORE_LIBRARY_PATH  ""
-#  define MAGICKCORE_CODER_PATH  ""
-#  define MAGICKCORE_FILTER_PATH  ""
 #  define MAGICKCORE_SHARE_PATH  ""
 #  define X11_PREFERENCES_PATH  "~/."
 #  if defined(DISABLE_SIOUX)

Makefile.in

@@ -2478,6 +2478,7 @@ CFLAGS = @CFLAGS@
 CGMDecodeDelegate = @CGMDecodeDelegate@
 CL_CFLAGS = @CL_CFLAGS@
 CL_LIBS = @CL_LIBS@
+CODER_DIRNAME = @CODER_DIRNAME@
 CODER_PATH = @CODER_PATH@
 CONFIGURE_ARGS = @CONFIGURE_ARGS@
 CONFIGURE_PATH = @CONFIGURE_PATH@
@@ -2519,6 +2520,7 @@ EditorDelegate = @EditorDelegate@
 FFTW_LIBS = @FFTW_LIBS@
 FGREP = @FGREP@
 FIGDecodeDelegate = @FIGDecodeDelegate@
+FILTER_DIRNAME = @FILTER_DIRNAME@
 FILTER_PATH = @FILTER_PATH@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -2590,6 +2592,7 @@ LZMA_CFLAGS = @LZMA_CFLAGS@
 LZMA_LIBS = @LZMA_LIBS@
 LaunchDelegate = @LaunchDelegate@
 MAGICKCORE_PATH = @MAGICKCORE_PATH@
+MAGICK_ABISUFFIX = @MAGICK_ABISUFFIX@
 MAGICK_CFLAGS = @MAGICK_CFLAGS@
 MAGICK_CODER_MODULE_PATH = @MAGICK_CODER_MODULE_PATH@
 MAGICK_CONFIGURE_BUILD_PATH = @MAGICK_CONFIGURE_BUILD_PATH@
@@ -2623,6 +2626,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_DIR = @MAN_DIR@
 MATH_LIBS = @MATH_LIBS@
 MKDIR_P = @MKDIR_P@
+MODULES_BASEDIRNAME = @MODULES_BASEDIRNAME@
+MODULES_DIRNAME = @MODULES_DIRNAME@
+MODULES_PATH = @MODULES_PATH@
+MODULES_RELATIVE_PATH = @MODULES_RELATIVE_PATH@
 MODULE_EXTRA_CPPFLAGS = @MODULE_EXTRA_CPPFLAGS@
 MPEGDecodeDelegate = @MPEGDecodeDelegate@
 MPEGEncodeDelegate = @MPEGEncodeDelegate@
@@ -4282,6 +4289,7 @@ MAGICKCORE_INCLUDE_HDRS = \
 	MagickCore/magic-private.h \
 	MagickCore/magick.h \
 	MagickCore/magick-config.h \
+	MagickCore/magick-baseconfig.h \
 	MagickCore/magick-type.h \
 	MagickCore/matrix.h \
 	MagickCore/memory_.h \
@@ -4655,7 +4663,9 @@ MAGICKPP_INCHEADERS_OPT = \
 @HAVE_LD_VERSION_SCRIPT_TRUE@Magick___lib_libMagick___la_LDFLAGS_VERSION = -Wl,--version-script=$(top_srcdir)/Magick++/lib/libMagick++.map
 Magick___lib_libMagick___la_LDFLAGS = -no-undefined \
   $(Magick___lib_libMagick___la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \
-	-version-info $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
+  -release $(MAGICK_ABISUFFIX) \
+  -version-info \
+  $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
 
 Magick___lib_libMagick___la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 MAGICKPP_CHECK_PGRMS_OPT = \
@@ -10594,7 +10604,7 @@ MagickCore-install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(MagickCoreincdir)
 	$(INSTALL_HEADER) MagickCore/magick-config.h $(DESTDIR)$(MagickCoreincdir)/magick-config.h
 MagickCore-uninstall-local:
-	rm -f $(DESTDIR)$(MagickCoreincdir)/magick-config.h
+	rm -f $(DESTDIR)$(MagickCoreincdir)/magick-baseconfig.h
 install-exec-local-utilities:
 	$(mkdir_p) $(DESTDIR)$(bindir)
 	cd $(DESTDIR)$(bindir) ; \

PerlMagick/check.sh

@@ -1,3 +1,4 @@
+#!/bin/sh
 #  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
 #  dedicated to making software imaging solutions freely available.
 #

config/config.h.in

@@ -21,11 +21,8 @@
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 #undef CLOSEDIR_VOID
 
-/* Location of coder modules */
-#undef CODER_PATH
-
-/* Subdirectory of lib where coder modules are installed */
-#undef CODER_RELATIVE_PATH
+/* "coders subdirectory". */
+#undef CODER_DIRNAME
 
 /* Directory where architecture-dependent configuration files live. */
 #undef CONFIGURE_PATH
@@ -52,11 +49,8 @@
 /* Define if you have FFTW library */
 #undef FFTW_DELEGATE
 
-/* Location of filter modules */
-#undef FILTER_PATH
-
-/* Subdirectory of lib where filter modules are installed */
-#undef FILTER_RELATIVE_PATH
+/* "filter subdirectory". */
+#undef FILTER_DIRNAME
 
 /* Define if you have FONTCONFIG library */
 #undef FONTCONFIG_DELEGATE
@@ -759,6 +753,12 @@
 /* Target Host Vendor */
 #undef MAGICK_TARGET_VENDOR
 
+/* Module directory name without ABI part. */
+#undef MODULES_BASEDIRNAME
+
+/* Module directory dirname (if different of default)" */
+#undef MODULES_DIRNAME
+
 /* Magick API method prefix */
 #undef NAMESPACE_PREFIX
 

configure

@@ -736,7 +736,13 @@ SHARE_PATH
 CONFIGURE_PATH
 DOCUMENTATION_PATH
 FILTER_PATH
+FILTER_DIRNAME
 CODER_PATH
+CODER_DIRNAME
+MODULES_PATH
+MODULES_RELATIVE_PATH
+MODULES_DIRNAME
+MODULES_BASEDIRNAME
 LIBRARY_PATH
 EXECUTABLE_PATH
 INCLUDE_PATH
@@ -878,6 +884,7 @@ MODULE_EXTRA_CPPFLAGS
 LIBSTDCLDFLAGS
 PERL_MAKE_OPTIONS
 MAGICK_LT_RELEASE_OPTS
+MAGICK_ABISUFFIX
 QUANTUM_DEPTH
 LEGACY_SUPPORT_FALSE
 LEGACY_SUPPORT_TRUE
@@ -3470,7 +3477,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 ac_config_headers="$ac_config_headers config/config.h"
 
 
-ac_config_commands="$ac_config_commands MagickCore/magick-config.h"
+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/ImageMagick++.pc Magick++/lib/Magick++.pc MagickCore/MagickCore-config MagickCore/MagickCore.pc MagickCore/version.h Makefile magick.sh PerlMagick/Magick.pm PerlMagick/Makefile.PL PerlMagick/check.sh 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"
 
@@ -3639,7 +3646,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=10044:10059M
+MAGICK_SVN_REVISION=10062:10071M
 
 
 
@@ -20997,6 +21004,11 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+# define a lib suffix for abi purpose
+MAGICK_ABISUFFIX="Q${MAGICK_HDRI}${QUANTUM_DEPTH}"
+
+
+
 # Set pixel cache threshold
 
 # Check whether --with-cache was given.
@@ -31986,47 +31998,66 @@ _ACEOF
 
 
 #
-# Subdirectory under lib to place ImageMagick coder module files
-CODER_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/modules-Q${QUANTUM_DEPTH}/coders"
+# path to modules lib
+if test "x$MODULES_BASEDIRNAME" = "x"; then
+   MODULES_BASEDIRNAME="modules"
+fi
 
 cat >>confdefs.h <<_ACEOF
-#define CODER_RELATIVE_PATH "$CODER_RELATIVE_PATH"
+#define MODULES_BASEDIRNAME "$MODULES_BASEDIRNAME"
 _ACEOF
 
-CODER_PATH="${LIB_DIR}/${CODER_RELATIVE_PATH}"
-DEFINE_CODER_PATH="${LIB_DIR}/${CODER_RELATIVE_PATH}/"
-case "${build_os}" in
-  mingw* )
-    DEFINE_CODER_PATH=`$WinPathScript "$DEFINE_CODER_PATH" 1`
-    ;;
-esac
+
+
+if test "x$MODULES_DIRNAME" = "x"; then
+   MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABISUFFIX}
+else
+   # not defined by default
 
 cat >>confdefs.h <<_ACEOF
-#define CODER_PATH "$DEFINE_CODER_PATH"
+#define MODULES_DIRNAME "$MODULES_DIRNAME"
 _ACEOF
 
+fi
+
+
+MODULES_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/${MODULES_DIRNAME}"
+
+MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}"
+
+
+#
+# path to coders lib
+if test "x$CODER_DIRNAME" = "x"; then
+   CODER_DIRNAME="coders"
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define CODER_DIRNAME "$CODER_DIRNAME"
+_ACEOF
+
+
+
+CODER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${CODER_DIRNAME}"
+CODER_PATH="${MODULES_PATH}/${CODER_DIRNAME}"
 
 
 #
 # Subdirectory under lib to place ImageMagick filter module files
-FILTER_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/modules-Q${QUANTUM_DEPTH}/filters"
+#
+# path to coders lib
+if test "x$FILTER_DIRNAME" = "x"; then
+   FILTER_DIRNAME="filters"
+fi
 
 cat >>confdefs.h <<_ACEOF
-#define FILTER_RELATIVE_PATH "$FILTER_RELATIVE_PATH"
+#define FILTER_DIRNAME "$FILTER_DIRNAME"
 _ACEOF
 
-FILTER_PATH="${LIB_DIR}/${FILTER_RELATIVE_PATH}"
-DEFINE_FILTER_PATH="${LIB_DIR}/${FILTER_RELATIVE_PATH}/"
-case "${build_os}" in
-  mingw* )
-    DEFINE_FILTER_PATH=`$WinPathScript "$DEFINE_FILTER_PATH" 1`
-    ;;
-esac
 
-cat >>confdefs.h <<_ACEOF
-#define FILTER_PATH "$DEFINE_FILTER_PATH"
-_ACEOF
 
+FILTER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${FILTER_DIRNAME}"
+FILTER_PATH="${MODULES_PATH}/${FILTER_DIRNAME}"
 
 
 #
@@ -36384,7 +36415,7 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS config/config.h" ;;
-    "MagickCore/magick-config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS MagickCore/magick-config.h" ;;
+    "MagickCore/magick-baseconfig.h") CONFIG_COMMANDS="$CONFIG_COMMANDS MagickCore/magick-baseconfig.h" ;;
     "common.shi") CONFIG_FILES="$CONFIG_FILES common.shi" ;;
     "config/configure.xml") CONFIG_FILES="$CONFIG_FILES config/configure.xml" ;;
     "config/delegates.xml") CONFIG_FILES="$CONFIG_FILES config/delegates.xml" ;;
@@ -37026,7 +37057,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
 
   case $ac_file$ac_mode in
-    "MagickCore/magick-config.h":C) ac_prefix_conf_OUT=`echo MagickCore/magick-config.h`
+    "MagickCore/magick-baseconfig.h":C) ac_prefix_conf_OUT=`echo MagickCore/magick-baseconfig.h`
 ac_prefix_conf_DEF=`echo _$ac_prefix_conf_OUT | sed -e "y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:" -e "s/[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g"`
 ac_prefix_conf_PKG=`echo MagickCore`
 ac_prefix_conf_LOW=`echo _$ac_prefix_conf_PKG | sed -e "y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:"`
@@ -38120,7 +38151,7 @@ RSVG              --with-rsvg=$with_rsvg		$have_rsvg
 TIFF              --with-tiff=$with_tiff		$have_tiff
 WEBP              --with-webp=$with_webp		$have_webp
 Windows fonts     --with-windows-font-dir=$with_windows_font_dir	$result_windows_font_dir
-WMF               --with-wmf=$with_wmf			$have_wmf
+WMF               --with-wmf=$with_wmf		$have_wmf
 X11               --with-x=$with_x			$have_x
 XML               --with-xml=$with_xml		$have_xml
 ZLIB              --with-zlib=$with_zlib		$have_zlib
@@ -38197,7 +38228,7 @@ RSVG              --with-rsvg=$with_rsvg		$have_rsvg
 TIFF              --with-tiff=$with_tiff		$have_tiff
 WEBP              --with-webp=$with_webp		$have_webp
 Windows fonts     --with-windows-font-dir=$with_windows_font_dir	$result_windows_font_dir
-WMF               --with-wmf=$with_wmf			$have_wmf
+WMF               --with-wmf=$with_wmf		$have_wmf
 X11               --with-x=$with_x			$have_x
 XML               --with-xml=$with_xml		$have_xml
 ZLIB              --with-zlib=$with_zlib		$have_zlib

configure.ac

@@ -34,7 +34,7 @@ AC_CONFIG_AUX_DIR([config])
 AC_REQUIRE_AUX_FILE([tap-driver.sh])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config/config.h])
-AX_PREFIX_CONFIG_H([MagickCore/magick-config.h],[MagickCore])
+AX_PREFIX_CONFIG_H([MagickCore/magick-baseconfig.h],[MagickCore])
 AC_CONFIG_FILES([\
     common.shi \
     config/configure.xml \
@@ -713,6 +713,11 @@ QUANTUM_DEPTH="$with_quantum_depth"
 AC_DEFINE_UNQUOTED(QUANTUM_DEPTH,$QUANTUM_DEPTH,[Number of bits in a pixel Quantum (8/16/32/64)])
 AC_SUBST(QUANTUM_DEPTH)dnl
 
+# define a lib suffix for abi purpose
+MAGICK_ABISUFFIX="Q${MAGICK_HDRI}${QUANTUM_DEPTH}"
+AC_SUBST(MAGICK_ABISUFFIX)
+
+
 # Set pixel cache threshold
 AC_ARG_WITH([cache],
     [AC_HELP_STRING([--with-cache=THRESHOLD],
@@ -2993,31 +2998,50 @@ AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_LIBRARY_PATH",Directory where architect
 AC_SUBST(LIBRARY_PATH)
 
 #
-# Subdirectory under lib to place ImageMagick coder module files
-CODER_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/modules-Q${QUANTUM_DEPTH}/coders"
-AC_DEFINE_UNQUOTED(CODER_RELATIVE_PATH,"$CODER_RELATIVE_PATH",Subdirectory of lib where coder modules are installed)
-CODER_PATH="${LIB_DIR}/${CODER_RELATIVE_PATH}"
-DEFINE_CODER_PATH="${LIB_DIR}/${CODER_RELATIVE_PATH}/"
-case "${build_os}" in
-  mingw* )
-    DEFINE_CODER_PATH=`$WinPathScript "$DEFINE_CODER_PATH" 1`
-    ;;
-esac
-AC_DEFINE_UNQUOTED(CODER_PATH,"$DEFINE_CODER_PATH",Location of coder modules)
+# path to modules lib
+if test "x$MODULES_BASEDIRNAME" = "x"; then
+   MODULES_BASEDIRNAME="modules"
+fi
+AC_DEFINE_UNQUOTED(MODULES_BASEDIRNAME,"$MODULES_BASEDIRNAME",Module directory name without ABI part.)
+AC_SUBST(MODULES_BASEDIRNAME)
+
+if test "x$MODULES_DIRNAME" = "x"; then
+   MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABISUFFIX}
+else
+   # not defined by default 
+   AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",Module directory dirname (if different of default)")
+fi
+AC_SUBST(MODULES_DIRNAME)
+
+MODULES_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/${MODULES_DIRNAME}"
+AC_SUBST(MODULES_RELATIVE_PATH)
+MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}"
+AC_SUBST(MODULES_PATH)
+
+#
+# path to coders lib
+if test "x$CODER_DIRNAME" = "x"; then
+   CODER_DIRNAME="coders"
+fi
+AC_DEFINE_UNQUOTED(CODER_DIRNAME,"$CODER_DIRNAME","coders subdirectory".)
+AC_SUBST(CODER_DIRNAME)
+
+CODER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${CODER_DIRNAME}"
+CODER_PATH="${MODULES_PATH}/${CODER_DIRNAME}"
 AC_SUBST(CODER_PATH)
 
 #
 # Subdirectory under lib to place ImageMagick filter module files
-FILTER_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/modules-Q${QUANTUM_DEPTH}/filters"
-AC_DEFINE_UNQUOTED(FILTER_RELATIVE_PATH,"$FILTER_RELATIVE_PATH",Subdirectory of lib where filter modules are installed)
-FILTER_PATH="${LIB_DIR}/${FILTER_RELATIVE_PATH}"
-DEFINE_FILTER_PATH="${LIB_DIR}/${FILTER_RELATIVE_PATH}/"
-case "${build_os}" in
-  mingw* )
-    DEFINE_FILTER_PATH=`$WinPathScript "$DEFINE_FILTER_PATH" 1`
-    ;;
-esac
-AC_DEFINE_UNQUOTED(FILTER_PATH,"$DEFINE_FILTER_PATH",Location of filter modules)
+#
+# path to coders lib
+if test "x$FILTER_DIRNAME" = "x"; then
+   FILTER_DIRNAME="filters"
+fi
+AC_DEFINE_UNQUOTED(FILTER_DIRNAME,"$FILTER_DIRNAME","filter subdirectory".)
+AC_SUBST(FILTER_DIRNAME)
+
+FILTER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${FILTER_DIRNAME}"
+FILTER_PATH="${MODULES_PATH}/${FILTER_DIRNAME}"
 AC_SUBST(FILTER_PATH)
 
 #

version.sh

@@ -35,6 +35,6 @@ PACKAGE_VERSION_ADDENDUM="-${PACKAGE_RELEASE}"
 # source and binary compatibility with older minor versions, and changes
 # in the PATCH level are perfectly compatible, forwards and backwards.
 # See http://apr.apache.org/versioning.html.
-MAGICK_LIBRARY_CURRENT=7
+MAGICK_LIBRARY_CURRENT=10
 MAGICK_LIBRARY_REVISION=0
 MAGICK_LIBRARY_AGE=0