(no commit message)

diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am
index 4a6ce374f90711e96f284628831880221322cdd2..59327d122e5c168875ee5f9e5528a83503beafde 100644 (file)
--- a/Magick++/Makefile.am
+++ b/Magick++/Makefile.am
@@ -137,7 +137,7 @@ endif
 
 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 d2b6e473ee82f1d8d78636fe4681da5d7511769e..bc76dd3fd2aeadbf396d7e7f75391687eab2b7ef 100644 (file)
--- a/MagickCore/ImageMagick.pc.in
+++ b/MagickCore/ImageMagick.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 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 40ee1119bea17cdba25fa411a7d71f506097a468..e36b5094fa11fde3fcdc4f2463ed49d67404a324 100644 (file)
--- a/MagickCore/MagickCore.pc.in
+++ b/MagickCore/MagickCore.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 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 7d96a62a1401c99f6b21585955b238c60141d7a5..c1e5cbcc7fde224092ca5b7e5708a57c1331d53f 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -52,7 +52,8 @@ endif
 
 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_EXTRA_DIST = \
        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 89a0a68e9410b1a7c344b2abe1ffeb598fde5d73..e016e5e9bdc5d0ed33060b15e34118304f998a23 100644 (file)
--- 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 1c531181115f1c7ce4d04f80c2b1d54c8239e1b6..d81da087a2cd4bf9655b23b32548659b4fd160d5 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -37,9 +37,9 @@ extern "C" {
 
 /*  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 @@ extern "C" {
  
 /* 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 a3dbe407af380439086063a6c39fad34076bf373..6a6d1f79c623ccb93ee7271fd117e333bf8089ae 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,13 +27,13 @@ extern "C" {
 */
 #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 3424f53e1ce008932293a22bffc4844cdcc53aee..6b1e7590e018bb1a082dee7f22a1f5489f2bfe60 100644 (file)
--- a/MagickWand/MagickWand.pc.in
+++ b/MagickWand/MagickWand.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@/ImageMagick
 
 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 1c82e85acf3d72ebde77298594f1c438bcfb82b3..127dcc9f1c922f1da174caae9aee2372901a6eff 100644 (file)
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -134,8 +134,8 @@ MagickWand_libMagickWand_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
 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 5e13d0edd55d6dd79700c94a4fab602e69f9fdef..b1cfa0adab7eace06f9f57c4fb3f98126f94a377 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2592,7 +2592,7 @@ LZMA_CFLAGS = @LZMA_CFLAGS@
 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 @@ MagickCore_libMagickCore_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/lt
 @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_EXTRA_DIST = \
        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 @@ MagickWand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
 @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 @@ 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) \
-  -release $(MAGICK_ABISUFFIX) \
+  -release $(MAGICK_ABI_SUFFIX) \
   -version-info \
   $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
 
@@ -10602,7 +10603,7 @@ uninstall-man: uninstall-man1
 
 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 bb6e9a51da1127f3ecdb8be725955b089a6458d8..5b8a025979fd0abbbb003f67e374388698cc2322 100644 (file)
--- 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 c4ac975b111e202091bf4f7f281d520380dfea5b..64632de8d144f8c12753014c2f824ab7cd0aa89d 100755 (executable)
--- a/configure
+++ b/configure
@@ -884,7 +884,7 @@ MODULE_EXTRA_CPPFLAGS
 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_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=10062:10076M
+MAGICK_SVN_REVISION=10062:10078M
 
 
 
@@ -21005,8 +21005,10 @@ _ACEOF
 
 
 # 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 @@ _ACEOF
 
 
 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 7fe54adc45af8d122ed669342f92c4688801f249..a28e77a9f1927a415f188acffadedb61728b6134 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -714,9 +714,11 @@ AC_DEFINE_UNQUOTED(QUANTUM_DEPTH,$QUANTUM_DEPTH,[Number of bits in a pixel Quant
 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_DEFINE_UNQUOTED(MODULES_BASEDIRNAME,"$MODULES_BASEDIRNAME",Module directory n
 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 6142498f175e91f1ad8ad1c6759942f9a6e163ae..da712b79fc4c0f70c7863515e668e5f185700ac3 100644 (file)
--- a/version.sh
+++ b/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=10
+MAGICK_LIBRARY_CURRENT=8
 MAGICK_LIBRARY_REVISION=0
 MAGICK_LIBRARY_AGE=0