...

diff --git a/Makefile.in b/Makefile.in
index fa6bcf6cb16c13bf55f36d70767e318200b9b016..5beac6c4a4e3ed8a5138278bcb6611a0b9e4b1a3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2619,8 +2619,6 @@ LIBOPENJP2_CFLAGS = @LIBOPENJP2_CFLAGS@
 LIBOPENJP2_LIBS = @LIBOPENJP2_LIBS@
 LIBRARY_EXTRA_CPPFLAGS = @LIBRARY_EXTRA_CPPFLAGS@
 LIBRARY_PATH = @LIBRARY_PATH@
-LIBRAW_CFLAGS = @LIBRAW_CFLAGS@
-LIBRAW_LIBS = @LIBRAW_LIBS@
 LIBS = @LIBS@
 LIBSTDCLDFLAGS = @LIBSTDCLDFLAGS@
 LIBTOOL = @LIBTOOL@

diff --git a/coders/dng.c b/coders/dng.c
index 8971d551c7e02c1924dd3f0010e512765d461e0a..ae56776ece75a7a5b6f362d0b091b030de4d1c12 100644 (file)
--- a/coders/dng.c
+++ b/coders/dng.c
@@ -64,7 +64,7 @@
 #include "MagickCore/xml-tree.h"
 #include "MagickCore/xml-tree-private.h"
 #if defined(MAGICKCORE_RAW_DELEGATE)
-#include <libraw/libraw.h>
+#include <libraw.h>
 #endif
 \f
 /*

diff --git a/configure b/configure
index 7d1b01b48d82dd22cce8b33c1ea9407981fe3878..a905179cdbc677233b3c7b876b1aaab03b1338ba 100755 (executable)
--- a/configure
+++ b/configure
@@ -773,12 +773,10 @@ CAIRO_SVG_LIBS
 CAIRO_SVG_CFLAGS
 RSVG_LIBS
 RSVG_CFLAGS
-RAW_LIBS
-RAW_CFLAGS
 RAW_DELEGATE_FALSE
 RAW_DELEGATE_TRUE
-LIBRAW_LIBS
-LIBRAW_CFLAGS
+RAW_LIBS
+RAW_CFLAGS
 PNG_DELEGATE_FALSE
 PNG_DELEGATE_TRUE
 PNG_LIBS
@@ -1280,8 +1278,8 @@ PANGO_CFLAGS
 PANGO_LIBS
 PNG_CFLAGS
 PNG_LIBS
-LIBRAW_CFLAGS
-LIBRAW_LIBS
+RAW_CFLAGS
+RAW_LIBS
 RSVG_CFLAGS
 RSVG_LIBS
 CAIRO_SVG_CFLAGS
@@ -2102,9 +2100,8 @@ Some influential environment variables:
   PANGO_LIBS  linker flags for PANGO, overriding pkg-config
   PNG_CFLAGS  C compiler flags for PNG, overriding pkg-config
   PNG_LIBS    linker flags for PNG, overriding pkg-config
-  LIBRAW_CFLAGS
-              C compiler flags for LIBRAW, overriding pkg-config
-  LIBRAW_LIBS linker flags for LIBRAW, overriding pkg-config
+  RAW_CFLAGS  C compiler flags for RAW, overriding pkg-config
+  RAW_LIBS    linker flags for RAW, overriding pkg-config
   RSVG_CFLAGS C compiler flags for RSVG, overriding pkg-config
   RSVG_LIBS   linker flags for RSVG, overriding pkg-config
   CAIRO_SVG_CFLAGS
@@ -4532,7 +4529,7 @@ MAGICK_PATCHLEVEL_VERSION=1
 
 MAGICK_VERSION=7.0.6-1
 
-MAGICK_GIT_REVISION=20419:f94b084a6:20170714
+MAGICK_GIT_REVISION=20423:cb6833b82:20170714
 
 
 # Substitute library versioning
@@ -33738,11 +33735,11 @@ if test "x$with_raw" = "xyes"; then
 $as_echo "-------------------------------------------------------------" >&6; }
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBRAW" >&5
-$as_echo_n "checking for LIBRAW... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAW" >&5
+$as_echo_n "checking for RAW... " >&6; }
 
-if test -n "$LIBRAW_CFLAGS"; then
-    pkg_cv_LIBRAW_CFLAGS="$LIBRAW_CFLAGS"
+if test -n "$RAW_CFLAGS"; then
+    pkg_cv_RAW_CFLAGS="$RAW_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw >= 0.14.8\""; } >&5
@@ -33750,7 +33747,7 @@ if test -n "$LIBRAW_CFLAGS"; then
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBRAW_CFLAGS=`$PKG_CONFIG --cflags "libraw >= 0.14.8" 2>/dev/null`
+  pkg_cv_RAW_CFLAGS=`$PKG_CONFIG --cflags "libraw >= 0.14.8" 2>/dev/null`
                      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -33758,8 +33755,8 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$LIBRAW_LIBS"; then
-    pkg_cv_LIBRAW_LIBS="$LIBRAW_LIBS"
+if test -n "$RAW_LIBS"; then
+    pkg_cv_RAW_LIBS="$RAW_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw >= 0.14.8\""; } >&5
@@ -33767,7 +33764,7 @@ if test -n "$LIBRAW_LIBS"; then
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBRAW_LIBS=`$PKG_CONFIG --libs "libraw >= 0.14.8" 2>/dev/null`
+  pkg_cv_RAW_LIBS=`$PKG_CONFIG --libs "libraw >= 0.14.8" 2>/dev/null`
                      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -33788,12 +33785,12 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               LIBRAW_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libraw >= 0.14.8" 2>&1`
+               RAW_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libraw >= 0.14.8" 2>&1`
         else
-               LIBRAW_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libraw >= 0.14.8" 2>&1`
+               RAW_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libraw >= 0.14.8" 2>&1`
         fi
        # Put the nasty error message in config.log where it belongs
-       echo "$LIBRAW_PKG_ERRORS" >&5
+       echo "$RAW_PKG_ERRORS" >&5
 
        have_raw=no
 elif test $pkg_failed = untried; then
@@ -33801,8 +33798,8 @@ elif test $pkg_failed = untried; then
 $as_echo "no" >&6; }
        have_raw=no
 else
-       LIBRAW_CFLAGS=$pkg_cv_LIBRAW_CFLAGS
-       LIBRAW_LIBS=$pkg_cv_LIBRAW_LIBS
+       RAW_CFLAGS=$pkg_cv_RAW_CFLAGS
+       RAW_LIBS=$pkg_cv_RAW_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
        have_raw=yes

diff --git a/configure.ac b/configure.ac
index 32375ebc83c18c6c20a61610ec9eb2287955f5ad..40c6719af5ea4184df201b9f7bcb10dac8c781b4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2614,7 +2614,7 @@ RAW_LIBS=""
 RAW_PKG=""
 if test "x$with_raw" = "xyes"; then
   AC_MSG_RESULT([-------------------------------------------------------------])
-  PKG_CHECK_MODULES(LIBRAW,[libraw >= 0.14.8], have_raw=yes, have_raw=no)
+  PKG_CHECK_MODULES(RAW,[libraw >= 0.14.8], have_raw=yes, have_raw=no)
   AC_MSG_RESULT([])
 fi