From 37e3fa7673da8718eafa153c19c85898c95cc47c Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 29 Jan 2014 14:11:19 +0000 Subject: [PATCH] --- MagickCore/version.h | 2 +- Makefile.in | 5 +++-- coders/Makefile.am | 2 +- configure | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MagickCore/version.h b/MagickCore/version.h index e7d6a669b..8067d406a 100644 --- 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 590288e7f..8ec4af596 100644 --- 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 6c28ec4e0..cbbe32665 100644 --- 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 9551ad3ec..ae17d3c65 100755 --- 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 -- 2.50.1