commit e2f4a15fab04c5f4e737ee0a4260973d76fa1ba7
author cristy <urban-warrior@git.imagemagick.org> Tue Mar 04 21:03:49 2014 +0000
committer cristy <urban-warrior@git.imagemagick.org> Tue Mar 04 21:03:49 2014 +0000
tree b2dd232e8c684a0a038a9b451e46ec685d46a625
parent 6a91c18a60eb2e0ab3c60293f759808e65bc2c49

MagickCore/version.h

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 42773b9..9b5ee2c 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2014 ImageMagick Studio LLC"
-#define MagickSVNRevision  "14829M"
+#define MagickSVNRevision  "15015M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -48,7 +48,7 @@
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2014-02-22"
+#define MagickReleaseDate  "2014-03-04"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

configure

diff --git a/configure b/configure
index 609ff04..6fb46fc 100755
--- a/configure
+++ b/configure
@@ -3698,7 +3698,7 @@
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=14829M
+MAGICK_SVN_REVISION=15015M
 
 
 # Substitute library versioning
@@ -28971,6 +28971,7 @@
             have_fpx='no (failed tests)'
         else
             FPX_LIBS='-lfpx'
+            LIBS="$FPX_LIBS $LIBS"
 
 $as_echo "#define FPX_DELEGATE 1" >>confdefs.h
 

configure.ac

diff --git a/configure.ac b/configure.ac
index 5f977d9..d34e738 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1941,6 +1941,7 @@
             have_fpx='no (failed tests)'
         else
             FPX_LIBS='-lfpx'
+            LIBS="$FPX_LIBS $LIBS"
             AC_DEFINE(FPX_DELEGATE,1,Define if you have FlashPIX library)
             AC_MSG_RESULT([yes])
             have_fpx='yes'