diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am
index 4a6ce37..59327d1 100644
--- a/Magick++/Makefile.am
+++ b/Magick++/Makefile.am
@@ -137,7 +137,7 @@
Magick___lib_libMagick___la_LDFLAGS = -no-undefined \
$(Magick___lib_libMagick___la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \
- -release $(MAGICK_ABISUFFIX) \
+ -release $(MAGICK_ABI_SUFFIX) \
-version-info \
$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
Magick___lib_libMagick___la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
diff --git a/MagickCore/ImageMagick.pc.in b/MagickCore/ImageMagick.pc.in
index d2b6e47..bc76dd3 100644
--- a/MagickCore/ImageMagick.pc.in
+++ b/MagickCore/ImageMagick.pc.in
@@ -4,7 +4,7 @@
includedir=@includedir@/ImageMagick
Name: ImageMagick
-Description: ImageMagick - Convert, Edit, and Compose Images (ABI @MAGICK_ABISUFFIX@)
+Description: ImageMagick - Convert, Edit, and Compose Images (ABI @MAGICK_ABI_SUFFIX@)
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lMagickCore-@MAGICK_ABISUFFIX@
+Libs: -L${libdir} -lMagickCore-@MAGICK_ABI_SUFFIX@
Cflags: -I${includedir} @MAGICK_PCFLAGS@
diff --git a/MagickCore/MagickCore.pc.in b/MagickCore/MagickCore.pc.in
index 40ee111..e36b509 100644
--- a/MagickCore/MagickCore.pc.in
+++ b/MagickCore/MagickCore.pc.in
@@ -4,7 +4,7 @@
includedir=@includedir@/ImageMagick
Name: MagickCore
-Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABISUFFIX@)
+Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lMagickCore-@MAGICK_ABISUFFIX@
+Libs: -L${libdir} -lMagickCore-@MAGICK_ABI_SUFFIX@
Cflags: -I${includedir} @MAGICK_PCFLAGS@
diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 7d96a62..c1e5cbc 100644
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -52,7 +52,8 @@
MagickCore_libMagickCore_la_LDFLAGS = -no-undefined \
$(MagickCore_libMagickCore_la_LDFLAGS_VERSION) \
- $(OSX_GCOV_LDFLAG) $(MAGICK_LT_RELEASE_OPTS) -version-info \
+ $(OSX_GCOV_LDFLAG) $(MAGICK_LT_RELEASE_OPTS) \
+ -release $(MAGICK_ABI_SUFFIX) -version-info \
$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
MagickCore_libMagickCore_la_DEPENDENCIES =
@@ -472,11 +473,11 @@
MagickCore/vms.c \
MagickCore/xwdfile.h_vms
-# Install magick-config.h
+# Install magick-baseconfig.h
MAGICKCORE_INSTALL_DATA_LOCAL_TARGETS = MagickCore-install-data-local
MagickCore-install-data-local:
$(mkinstalldirs) $(DESTDIR)$(MagickCoreincdir)
- $(INSTALL_HEADER) MagickCore/magick-config.h $(DESTDIR)$(MagickCoreincdir)/magick-config.h
+ $(INSTALL_HEADER) MagickCore/magick-baseconfig.h $(DESTDIR)$(MagickCoreincdir)/magick-baseconfig.h
# Uninstall magick-config.h
MAGICKCORE_UNINSTALL_LOCAL_TARGETS = MagickCore-uninstall-local
diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 89a0a68..e016e5e 100644
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -1153,7 +1153,7 @@
#define MAGICKCORE_MODULES_BASEDIRNAME "modules"
#endif
-/* Module directory dirname (if different of default)" */
+/* Module directory dirname (if different of default) */
/* #undef MODULES_DIRNAME */
/* Magick API method prefix */
diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 1c53118..d81da08 100644
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -37,9 +37,9 @@
/* ABI SUFFIX */
#ifndef HDRI_SUPPORT
-#define MAGICKCORE_ABISUFFIX "Q" MAGICKCORE_STRING_XQUOTE(MAGICKCORE_QUANTUM_DEPTH)
+#define MAGICKCORE_ABI_SUFFIX "Q" MAGICKCORE_STRING_XQUOTE(MAGICKCORE_QUANTUM_DEPTH)
#else
-#define MAGICKCORE_ABISUFFIX "QHDRI" MAGICKCORE_STRING_XQUOTE(MAGICKCORE_QUANTUM_DEPTH)
+#define MAGICKCORE_ABI_SUFFIX "Q" MAGICKCORE_STRING_XQUOTE(MAGICKCORE_QUANTUM_DEPTH) "-HDRI"
#endif
/* some path game */
@@ -66,7 +66,7 @@
/* module dir */
#ifndef MAGICKCORE_MODULES_DIRNAME
-# define MAGICKCORE_MODULES_DIRNAME MAGICKCORE_MODULES_BASEDIRNAME "-" MAGICKCORE_ABISUFFIX
+# define MAGICKCORE_MODULES_DIRNAME MAGICKCORE_MODULES_BASEDIRNAME "-" MAGICKCORE_ABI_SUFFIX
#endif
#ifndef MAGICKCORE_MODULES_PATH
diff --git a/MagickCore/version.h b/MagickCore/version.h
index a3dbe40..6a6d1f7 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,13 +27,13 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision "10062:10076M"
+#define MagickSVNRevision "10062:10078M"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
-#define MagickLibVersionNumber 10,0,0
+#define MagickLibVersionNumber 8,0,0
#define MagickLibAddendum "-0"
-#define MagickLibInterface 10
-#define MagickLibMinInterface 10
+#define MagickLibInterface 8
+#define MagickLibMinInterface 8
#define MagickReleaseDate "2012-12-01"
#define MagickChangeDate "20121005"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
diff --git a/MagickWand/MagickWand.pc.in b/MagickWand/MagickWand.pc.in
index 3424f53..6b1e759 100644
--- a/MagickWand/MagickWand.pc.in
+++ b/MagickWand/MagickWand.pc.in
@@ -5,7 +5,7 @@
Name: MagickWand
Version: @PACKAGE_VERSION@
-Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABISUFFIX@)
+Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
Requires: ImageMagick
-Libs: -L${libdir} -lMagickWand-@MAGICK_ABISUFFIX@ -lMagickCore-@MAGICK_ABISUFFIX@
+Libs: -L${libdir} -lMagickWand-@MAGICK_ABI_SUFFIX@ -lMagickCore-@MAGICK_ABI_SUFFIX@
Cflags: -I${includedir} @MAGICK_PCFLAGS@
diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index 1c82e85..127dcc9 100644
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -134,8 +134,8 @@
endif
MagickWand_libMagickWand_la_LDFLAGS = -no-undefined \
- $(MagickWand_libMagickWand_la_LDFLAGS_VERSION) \
- $(MAGICK_LT_RELEASE_OPTS) -version-info \
+ $(MagickWand_libMagickWand_la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \
+ -release $(MAGICK_ABI_SUFFIX) -version-info \
$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
MagickWand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
diff --git a/Makefile.in b/Makefile.in
index 5e13d0e..b1cfa0a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2592,7 +2592,7 @@
LZMA_LIBS = @LZMA_LIBS@
LaunchDelegate = @LaunchDelegate@
MAGICKCORE_PATH = @MAGICKCORE_PATH@
-MAGICK_ABISUFFIX = @MAGICK_ABISUFFIX@
+MAGICK_ABI_SUFFIX = @MAGICK_ABI_SUFFIX@
MAGICK_CFLAGS = @MAGICK_CFLAGS@
MAGICK_CODER_MODULE_PATH = @MAGICK_CODER_MODULE_PATH@
MAGICK_CONFIGURE_BUILD_PATH = @MAGICK_CONFIGURE_BUILD_PATH@
@@ -3997,7 +3997,8 @@
@HAVE_LD_VERSION_SCRIPT_TRUE@MagickCore_libMagickCore_la_LDFLAGS_VERSION = -Wl,--version-script=$(top_srcdir)/MagickCore/libMagickCore.map
MagickCore_libMagickCore_la_LDFLAGS = -no-undefined \
$(MagickCore_libMagickCore_la_LDFLAGS_VERSION) \
- $(OSX_GCOV_LDFLAG) $(MAGICK_LT_RELEASE_OPTS) -version-info \
+ $(OSX_GCOV_LDFLAG) $(MAGICK_LT_RELEASE_OPTS) \
+ -release $(MAGICK_ABI_SUFFIX) -version-info \
$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
MagickCore_libMagickCore_la_DEPENDENCIES =
@@ -4414,7 +4415,7 @@
MagickCore/xwdfile.h_vms
-# Install magick-config.h
+# Install magick-baseconfig.h
MAGICKCORE_INSTALL_DATA_LOCAL_TARGETS = MagickCore-install-data-local
# Uninstall magick-config.h
@@ -4531,8 +4532,8 @@
@HAVE_LD_VERSION_SCRIPT_FALSE@MagickWand_libMagickWand_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
@HAVE_LD_VERSION_SCRIPT_TRUE@MagickWand_libMagickWand_la_LDFLAGS_VERSION = -Wl,--version-script=$(top_srcdir)/MagickWand/libMagickWand.map
MagickWand_libMagickWand_la_LDFLAGS = -no-undefined \
- $(MagickWand_libMagickWand_la_LDFLAGS_VERSION) \
- $(MAGICK_LT_RELEASE_OPTS) -version-info \
+ $(MagickWand_libMagickWand_la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \
+ -release $(MAGICK_ABI_SUFFIX) -version-info \
$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
MagickWand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
@@ -4663,7 +4664,7 @@
@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) \
- -release $(MAGICK_ABISUFFIX) \
+ -release $(MAGICK_ABI_SUFFIX) \
-version-info \
$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
@@ -10602,7 +10603,7 @@
MagickCore-install-data-local:
$(mkinstalldirs) $(DESTDIR)$(MagickCoreincdir)
- $(INSTALL_HEADER) MagickCore/magick-config.h $(DESTDIR)$(MagickCoreincdir)/magick-config.h
+ $(INSTALL_HEADER) MagickCore/magick-baseconfig.h $(DESTDIR)$(MagickCoreincdir)/magick-baseconfig.h
MagickCore-uninstall-local:
rm -f $(DESTDIR)$(MagickCoreincdir)/magick-baseconfig.h
install-exec-local-utilities:
diff --git a/config/config.h.in b/config/config.h.in
index bb6e9a5..5b8a025 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -756,7 +756,7 @@
/* Module directory name without ABI part. */
#undef MODULES_BASEDIRNAME
-/* Module directory dirname (if different of default)" */
+/* Module directory dirname (if different of default) */
#undef MODULES_DIRNAME
/* Magick API method prefix */
diff --git a/configure b/configure
index c4ac975..64632de 100755
--- a/configure
+++ b/configure
@@ -884,7 +884,7 @@
LIBSTDCLDFLAGS
PERL_MAKE_OPTIONS
MAGICK_LT_RELEASE_OPTS
-MAGICK_ABISUFFIX
+MAGICK_ABI_SUFFIX
QUANTUM_DEPTH
LEGACY_SUPPORT_FALSE
LEGACY_SUPPORT_TRUE
@@ -3646,7 +3646,7 @@
MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
-MAGICK_SVN_REVISION=10062:10076M
+MAGICK_SVN_REVISION=10062:10078M
@@ -21005,8 +21005,10 @@
# define a lib suffix for abi purpose
-MAGICK_ABISUFFIX="Q${MAGICK_HDRI}${QUANTUM_DEPTH}"
-
+MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}"
+if test "$enable_hdri" = 'yes'; then
+ MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}-${MAGICK_HDRI}"
+fi
# Set pixel cache threshold
@@ -32010,7 +32012,7 @@
if test "x$MODULES_DIRNAME" = "x"; then
- MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABISUFFIX}
+ MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
else
# not defined by default
diff --git a/configure.ac b/configure.ac
index 7fe54ad..a28e77a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -714,9 +714,11 @@
AC_SUBST(QUANTUM_DEPTH)dnl
# define a lib suffix for abi purpose
-MAGICK_ABISUFFIX="Q${MAGICK_HDRI}${QUANTUM_DEPTH}"
-AC_SUBST(MAGICK_ABISUFFIX)
-
+MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}"
+if test "$enable_hdri" = 'yes'; then
+ MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}-${MAGICK_HDRI}"
+fi
+AC_SUBST(MAGICK_ABI_SUFFIX)
# Set pixel cache threshold
AC_ARG_WITH([cache],
@@ -3006,7 +3008,7 @@
AC_SUBST(MODULES_BASEDIRNAME)
if test "x$MODULES_DIRNAME" = "x"; then
- MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABISUFFIX}
+ MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
else
# not defined by default
AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",Module directory dirname (if different of default))
diff --git a/version.sh b/version.sh
index 6142498..da712b7 100644
--- a/version.sh
+++ b/version.sh
@@ -35,6 +35,6 @@
# 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=10
+MAGICK_LIBRARY_CURRENT=8
MAGICK_LIBRARY_REVISION=0
MAGICK_LIBRARY_AGE=0
