(no commit message)

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 01e5ba68fc0f1579d8a3ec1a37e6963e6268a409..f18f41d34447ec0db37f9f3f5c4b4f97e9d6bc51 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -43,7 +43,15 @@ MagickCore_libMagickCore_la_SOURCES = $(MAGICKCORE_BASE_SRCS) $(MAGICKCORE_PLATF
 MagickCore_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS)
 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 ".*" \
+
+if HAVE_LD_VERSION_SCRIPT
+magick_libMagickCore_la_LDFLAGS_VERSION =  -Wl,--version-script=$(top_srcdir)/magick/libMagickCore.map
+else
+magick_libMagickCore_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
+endif
+
+MagickCore_libMagickCore_la_LDFLAGS = -no-undefined \
+  $(magick_libMagickCore_la_LDFLAGS_VERSION) \
   $(OSX_GCOV_LDFLAG) $(MAGICK_LT_RELEASE_OPTS) -version-info \
   $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
 MagickCore_libMagickCore_la_DEPENDENCIES =

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 79106d2331baff4428a25bcd3387fdfddf8474b5..2f7b1ad5b4503fe0040cc523d342e0fe4d38ddca 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "10044:10047M"
+#define MagickSVNRevision  "10044:10052M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0

diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index e3363a551fad02ee1fba8a4673916c0502231a9e..2419a42751b5edb1ba2d8e49d242186fe07eedea 100644 (file)
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -126,7 +126,9 @@ MAGICKWAND_LIBS = MagickWand/libMagickWand.la
 
 MagickWand_libMagickWand_la_SOURCES = $(MAGICKWAND_SOURCES)
 MagickWand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
-MagickWand_libMagickWand_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
+
+MagickWand_libMagickWand_la_LDFLAGS = -no-undefined \
+  $(magick_libMagickWand_la_LDFLAGS_VERSION) \
        $(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 863d3a8d6bafe7910bde9efef514698dfe31b1e5..b8490fb7142b2b385863b121c635f4211edb77c3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3986,7 +3986,10 @@ MAGICKCORE_LIBS = MagickCore/libMagickCore.la
 @WITH_MODULES_FALSE@MagickCore_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS)
 @WITH_MODULES_TRUE@MagickCore_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS)
 MagickCore_libMagickCore_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS)
-MagickCore_libMagickCore_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
+@HAVE_LD_VERSION_SCRIPT_FALSE@magick_libMagickCore_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
+@HAVE_LD_VERSION_SCRIPT_TRUE@magick_libMagickCore_la_LDFLAGS_VERSION = -Wl,--version-script=$(top_srcdir)/magick/libMagickCore.map
+MagickCore_libMagickCore_la_LDFLAGS = -no-undefined \
+  $(magick_libMagickCore_la_LDFLAGS_VERSION) \
   $(OSX_GCOV_LDFLAG) $(MAGICK_LT_RELEASE_OPTS) -version-info \
   $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
 
@@ -4517,7 +4520,8 @@ MAGICKWAND_BUILT_SRCS =
 MAGICKWAND_LIBS = MagickWand/libMagickWand.la
 MagickWand_libMagickWand_la_SOURCES = $(MAGICKWAND_SOURCES)
 MagickWand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
-MagickWand_libMagickWand_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
+MagickWand_libMagickWand_la_LDFLAGS = -no-undefined \
+  $(magick_libMagickWand_la_LDFLAGS_VERSION) \
        $(MAGICK_LT_RELEASE_OPTS) -version-info \
        $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
 

diff --git a/configure b/configure
index ffbe2f2e00ffa15a89798c2df8bbb929cde413b0..14343e3dbb8eb7294591a0fa11ef4304b717a759 100755 (executable)
--- a/configure
+++ b/configure
@@ -3639,7 +3639,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:10047M
+MAGICK_SVN_REVISION=10044:10052M