diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am
index 6a78531..098d387 100644
--- a/Magick++/Makefile.am
+++ b/Magick++/Makefile.am
@@ -128,7 +128,7 @@
Magick++/lib/Magick++/STL.h \
Magick++/lib/Magick++/TypeMetric.h
-Magick___lib_libMagick___la_LDFLAGS = -no-undefined \
+Magick___lib_libMagick___la_LDFLAGS = -no-undefined $(MAGICK_LT_RELEASE_OPTS) \
-version-info $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
Magick___lib_libMagick___la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 4b942ea..8e990dd 100644
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -44,7 +44,7 @@
endif # WITH_MODULES
MagickCore_libMagickCore_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS)
MagickCore_libMagickCore_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
- $(OSX_GCOV_LDFLAG) -version-info \
+ $(OSX_GCOV_LDFLAG) $(MAGICK_LT_RELEASE_OPTS) -version-info \
$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
MagickCore_libMagickCore_la_DEPENDENCIES = $(MAGICKCORE_LTDLDEPS)
diff --git a/MagickCore/version.h b/MagickCore/version.h
index bf99a64..322e99a 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision "9270:9274M"
+#define MagickSVNRevision "9270:9275M"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 7,0,0
diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index ac34e00..92fc911 100644
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -127,7 +127,7 @@
MagickWand_libMagickWand_la_SOURCES = $(MAGICKWAND_SOURCES)
MagickWand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
MagickWand_libMagickWand_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
- -version-info \
+ $(MAGICK_LT_RELEASE_OPTS) -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 d38774c..690577f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2671,6 +2671,7 @@
MAGICK_LIB_VERSION_NUMBER = @MAGICK_LIB_VERSION_NUMBER@
MAGICK_LIB_VERSION_TEXT = @MAGICK_LIB_VERSION_TEXT@
MAGICK_LTDLDEPS = @MAGICK_LTDLDEPS@
+MAGICK_LT_RELEASE_OPTS = @MAGICK_LT_RELEASE_OPTS@
MAGICK_PCFLAGS = @MAGICK_PCFLAGS@
MAGICK_SVN_REVISION = @MAGICK_SVN_REVISION@
MAGICK_TARGET_CPU = @MAGICK_TARGET_CPU@
@@ -4100,7 +4101,7 @@
@WITH_MODULES_TRUE@MagickCore_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL)
MagickCore_libMagickCore_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS)
MagickCore_libMagickCore_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
- $(OSX_GCOV_LDFLAG) -version-info \
+ $(OSX_GCOV_LDFLAG) $(MAGICK_LT_RELEASE_OPTS) -version-info \
$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
MagickCore_libMagickCore_la_DEPENDENCIES = $(MAGICKCORE_LTDLDEPS)
@@ -4631,7 +4632,7 @@
MagickWand_libMagickWand_la_SOURCES = $(MAGICKWAND_SOURCES)
MagickWand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
MagickWand_libMagickWand_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
- -version-info \
+ $(MAGICK_LT_RELEASE_OPTS) -version-info \
$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
MagickWand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
@@ -4756,7 +4757,7 @@
Magick++/lib/Magick++/STL.h \
Magick++/lib/Magick++/TypeMetric.h
-Magick___lib_libMagick___la_LDFLAGS = -no-undefined \
+Magick___lib_libMagick___la_LDFLAGS = -no-undefined $(MAGICK_LT_RELEASE_OPTS) \
-version-info $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
Magick___lib_libMagick___la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
diff --git a/configure b/configure
index afadc3d..b17826b 100755
--- a/configure
+++ b/configure
@@ -884,6 +884,7 @@
MODULE_EXTRA_CPPFLAGS
LIBSTDCLDFLAGS
PERL_MAKE_OPTIONS
+MAGICK_LT_RELEASE_OPTS
QUANTUM_DEPTH
LEGACY_SUPPORT_FALSE
LEGACY_SUPPORT_TRUE
@@ -1151,6 +1152,7 @@
with_cache
with_frozenpaths
with_magick_plus_plus
+with_package_release_name
with_perl
with_perl_options
with_umem
@@ -1864,7 +1866,7 @@
--enable-ltdl-install install libltdl
--enable-delegate-build look for delegate libraries in build directory
--disable-deprecated exclude deprecated methods in MagickCore and
- MagickWand API's
+ MagickWand APIs
--disable-installed Formally install ImageMagick under PREFIX
--disable-cipher disable enciphering and deciphering image pixels
--enable-zero-configuration
@@ -1911,6 +1913,8 @@
--with-frozenpaths freeze delegate paths
--without-magick-plus-plus
disable build/install of Magick++
+ --with-package-release-name=NAME
+ encode this name into the shared library
--with-perl enable build/install of PerlMagick
--with-perl-options=OPTIONS
options to pass on command-line when generating
@@ -3666,7 +3670,7 @@
MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
-MAGICK_SVN_REVISION=9270:9274M
+MAGICK_SVN_REVISION=9270:9275M
@@ -22058,6 +22062,15 @@
fi
+# Encode the this name into the shared library.
+
+# Check whether --with-package-release-name was given.
+if test "${with_package_release_name+set}" = set; then :
+ withval=$with_package_release_name; MAGICK_LT_RELEASE_OPTS="-release $withval"
+fi
+
+
+
# Disable build/install of PerlMagick.
# Check whether --with-perl was given.
@@ -35749,9 +35762,9 @@
if test "$with_modules" != 'no'; then
- MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
else
- MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
fi
diff --git a/configure.ac b/configure.ac
index f3acc2c..1dca2f2 100755
--- a/configure.ac
+++ b/configure.ac
@@ -569,7 +569,7 @@
AC_ARG_ENABLE([deprecated],
[AC_HELP_STRING([--disable-deprecated],
- [exclude deprecated methods in MagickCore and MagickWand API's])],
+ [exclude deprecated methods in MagickCore and MagickWand APIs])],
[enable_deprecated=$enableval],
[enable_deprecated='no'])
@@ -755,6 +755,13 @@
[with_magick_plus_plus=$withval],
[with_magick_plus_plus='yes'])
+# Encode the this name into the shared library.
+AC_ARG_WITH([package-release-name],
+ [AC_HELP_STRING([--with-package-release-name=NAME],
+ [encode this name into the shared library])],
+[MAGICK_LT_RELEASE_OPTS="-release $withval"])
+AC_SUBST(MAGICK_LT_RELEASE_OPTS)
+
# Disable build/install of PerlMagick.
AC_ARG_WITH([perl],
[AC_HELP_STRING([--with-perl],
@@ -3716,9 +3723,9 @@
AC_SUBST(MAGICK_LTDLDEPS)
if test "$with_modules" != 'no'; then
- MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
else
- MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
fi
AC_SUBST(MAGICK_DEP_LIBS)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index c56bb88..a4d0b5a 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -135,7 +135,7 @@
Magick++/lib/Magick++/STL.h \
Magick++/lib/Magick++/TypeMetric.h
-Magick___lib_libMagick___la_LDFLAGS = \
+Magick___lib_libMagick___la_LDFLAGS = $(MAGICK_LT_RELEASE_OPTS) \
-version-info $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
Magick___lib_libMagick___la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)