(no commit message)

diff --git a/Makefile.in b/Makefile.in
index 997457fc044355e147523b48f2250bd3cba6ae2d..a3087f57b88fc9e767f2823bf95aa27899a8c235 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1064,7 +1064,8 @@ coders_fits_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_CFLAGS) $(CFLAGS) $(coders_fits_la_LDFLAGS) $(LDFLAGS) -o \
        $@
 @WITH_MODULES_TRUE@am_coders_fits_la_rpath = -rpath $(codersdir)
-coders_fpx_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1)
+coders_fpx_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_1)
 am_coders_fpx_la_OBJECTS = coders/coders_fpx_la-fpx.lo
 coders_fpx_la_OBJECTS = $(am_coders_fpx_la_OBJECTS)
 coders_fpx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -3536,7 +3537,7 @@ coders_fits_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 coders_fpx_la_SOURCES = coders/fpx.c
 coders_fpx_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_fpx_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_fpx_la_LIBADD = $(MAGICKCORE_LIBS) $(FPX_LIBS) -lstdc++
+coders_fpx_la_LIBADD = $(MAGICKCORE_LIBS) $(FPX_LIBS) $(MATH_LIBS) -lstdc++
 
 # GIF coder module
 coders_gif_la_SOURCES = coders/gif.c

diff --git a/coders/Makefile.am b/coders/Makefile.am
index a28f194b7b3e581174e903034b5d8c270bdc88a5..7a6a797468c7e9d949449239764696be3c34c210 100644 (file)
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -506,7 +506,7 @@ coders_fits_la_LIBADD      = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 coders_fpx_la_SOURCES      = coders/fpx.c
 coders_fpx_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_fpx_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_fpx_la_LIBADD       = $(MAGICKCORE_LIBS) $(FPX_LIBS) -lstdc++
+coders_fpx_la_LIBADD       = $(MAGICKCORE_LIBS) $(FPX_LIBS) $(MATH_LIBS) -lstdc++
 
 # GIF coder module
 coders_gif_la_SOURCES      = coders/gif.c

diff --git a/configure b/configure
index 54102a9ea69ce4f2d12a9c158175ba37661cb82d..dc58bcb4d0d7f557f3c686a7f50d82623d8b9e2a 100755 (executable)
--- a/configure
+++ b/configure
@@ -3691,7 +3691,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=13449M
+MAGICK_SVN_REVISION=13449:13452M
 
 
 # Substitute library versioning