(no commit message)

diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am
index 9c5e7e0229b0369853cfda2926ee9945955f3413..c143ae076804591b69f6c1db01c992a1b510b38a 100644 (file)
--- a/Magick++/Makefile.am
+++ b/Magick++/Makefile.am
@@ -129,7 +129,14 @@ MAGICKPP_INCHEADERS_OPT = \
        Magick++/lib/Magick++/STL.h \
        Magick++/lib/Magick++/TypeMetric.h
 
-Magick___lib_libMagick___la_LDFLAGS = -no-undefined $(MAGICK_LT_RELEASE_OPTS) \
+if HAVE_LD_VERSION_SCRIPT
+Magick___lib_libMagick___la_LDFLAGS_VERSION =  -Wl,--version-script=$(top_srcdir)/Magick++/lib/libMagick++.map
+else
+Magick___lib_libMagick___la_LDFLAGS_VERSION = -export-symbols-regex ".*"
+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)
 Magick___lib_libMagick___la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 

diff --git a/Magick++/lib/libMagick++.map b/Magick++/lib/libMagick++.map
index 4be2371699e9269d54781c8bfec333db82a128d0..85297c9a6d6d291da5d13d49ab19862010f117df 100644 (file)
--- a/Magick++/lib/libMagick++.map
+++ b/Magick++/lib/libMagick++.map
@@ -1,4 +1,4 @@
- VERS_6.0 {
+ VERS_7.0 {
         global:
                 *;
-     };
\ No newline at end of file
+     };

diff --git a/MagickCore/libMagickCore.map b/MagickCore/libMagickCore.map
index 4be2371699e9269d54781c8bfec333db82a128d0..85297c9a6d6d291da5d13d49ab19862010f117df 100644 (file)
--- a/MagickCore/libMagickCore.map
+++ b/MagickCore/libMagickCore.map
@@ -1,4 +1,4 @@
- VERS_6.0 {
+ VERS_7.0 {
         global:
                 *;
-     };
\ No newline at end of file
+     };

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 2f7b1ad5b4503fe0040cc523d342e0fe4d38ddca..ef07971ba230ccd87d9e7bb92fa5c2811d4ec811 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:10052M"
+#define MagickSVNRevision  "10044:10054M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0

diff --git a/MagickWand/libMagickWand.map b/MagickWand/libMagickWand.map
index 4be2371699e9269d54781c8bfec333db82a128d0..85297c9a6d6d291da5d13d49ab19862010f117df 100644 (file)
--- a/MagickWand/libMagickWand.map
+++ b/MagickWand/libMagickWand.map
@@ -1,4 +1,4 @@
- VERS_6.0 {
+ VERS_7.0 {
         global:
                 *;
-     };
\ No newline at end of file
+     };

diff --git a/Makefile.in b/Makefile.in
index b8490fb7142b2b385863b121c635f4211edb77c3..0f1c3759b3c8c1539bef4d02a41dbdbac4493b82 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4649,7 +4649,10 @@ MAGICKPP_INCHEADERS_OPT = \
        Magick++/lib/Magick++/STL.h \
        Magick++/lib/Magick++/TypeMetric.h
 
-Magick___lib_libMagick___la_LDFLAGS = -no-undefined $(MAGICK_LT_RELEASE_OPTS) \
+@HAVE_LD_VERSION_SCRIPT_FALSE@Magick___lib_libMagick___la_LDFLAGS_VERSION = -export-symbols-regex ".*"
+@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)
 
 Magick___lib_libMagick___la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)

diff --git a/configure b/configure
index 14343e3dbb8eb7294591a0fa11ef4304b717a759..baee4c1c80c88619faa4910886ddccc2f2a6515a 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:10052M
+MAGICK_SVN_REVISION=10044:10054M