(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index e7d6a669bc8dd2f714a42eaeda5274575e6bae2b..8067d406aeb5cf62e1fe362018b564105f2aa38f 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2014 ImageMagick Studio LLC"
-#define MagickSVNRevision  "14671"
+#define MagickSVNRevision  "14671:14675M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0

diff --git a/Makefile.in b/Makefile.in
index 590288e7f6c61576abf81a0e2c7cb5488de9f40b..8ec4af5960195e850fd88816d8631de198daaba2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1170,7 +1170,8 @@ coders_ipl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(coders_ipl_la_LDFLAGS) $(LDFLAGS) -o $@
 @WITH_MODULES_TRUE@am_coders_ipl_la_rpath = -rpath $(codersdir)
-coders_jbig_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1)
+coders_jbig_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_1)
 am_coders_jbig_la_OBJECTS = coders/coders_jbig_la-jbig.lo
 coders_jbig_la_OBJECTS = $(am_coders_jbig_la_OBJECTS)
 coders_jbig_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -3633,7 +3634,7 @@ coders_ipl_la_LIBADD = $(MAGICKCORE_LIBS)
 coders_jbig_la_SOURCES = coders/jbig.c
 coders_jbig_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_jbig_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_jbig_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS)
+coders_jbig_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(MATH_LIBS)
 
 # JPEG coder module
 coders_jpeg_la_SOURCES = coders/jpeg.c

diff --git a/coders/Makefile.am b/coders/Makefile.am
index 6c28ec4e0516827c77ddc51010e9c105d5d72130..cbbe32665f6a73cba468937f9f5fa8c279f6dce3 100644 (file)
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -586,7 +586,7 @@ coders_ipl_la_LIBADD      = $(MAGICKCORE_LIBS)
 coders_jbig_la_SOURCES     = coders/jbig.c
 coders_jbig_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_jbig_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_jbig_la_LIBADD      = $(MAGICKCORE_LIBS) $(JBIG_LIBS)
+coders_jbig_la_LIBADD      = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(MATH_LIBS)
 
 # JPEG coder module
 coders_jpeg_la_SOURCES     = coders/jpeg.c

diff --git a/configure b/configure
index 9551ad3ecd81498ba706ff621a8e5d9a57a7de28..ae17d3c653b7b8feabc6a68537c6cc5d0c1c8e34 100755 (executable)
--- a/configure
+++ b/configure
@@ -3698,7 +3698,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=14671
+MAGICK_SVN_REVISION=14671:14675M
 
 
 # Substitute library versioning