diff --git a/MagickCore/version.h b/MagickCore/version.h
index 9b5ee2c..72a8cd2 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 "15015M"
+#define MagickSVNRevision "15015:15016M"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 1,0,0
diff --git a/configure b/configure
index 6fb46fc..572f6f1 100755
--- a/configure
+++ b/configure
@@ -3698,7 +3698,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=15015M
+MAGICK_SVN_REVISION=15015:15016M
# Substitute library versioning
@@ -28890,6 +28890,8 @@
have_fpx='no'
FPX_LIBS=''
+SAVED_LIBS=${LIBS}
+LIBS=${LIBS/-ldjvulibre/}
if test "$with_fpx" != 'no'; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
$as_echo "-------------------------------------------------------------" >&6; }
@@ -28971,7 +28973,6 @@
have_fpx='no (failed tests)'
else
FPX_LIBS='-lfpx'
- LIBS="$FPX_LIBS $LIBS"
$as_echo "#define FPX_DELEGATE 1" >>confdefs.h
@@ -28994,6 +28995,7 @@
fi
+LIBS=${SAVED_LIBS}
#
diff --git a/configure.ac b/configure.ac
index d34e738..420f76e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1924,6 +1924,8 @@
have_fpx='no'
FPX_LIBS=''
+SAVED_LIBS=${LIBS}
+LIBS=${LIBS/-ldjvulibre/}
if test "$with_fpx" != 'no'; then
AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for FlashPIX])
@@ -1941,7 +1943,6 @@
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'
@@ -1953,6 +1954,7 @@
fi
AM_CONDITIONAL(FPX_DELEGATE, test "$have_fpx" = 'yes')
AC_SUBST(FPX_LIBS)
+LIBS=${SAVED_LIBS}
dnl ===========================================================================