Merge branch '8.6'

ChangeLog

@@ -6,6 +6,9 @@
 - hough_line is 4x faster
 - hough_circle is 2x faster
 
+12/2/18 started 8.6.3
+- use pkg-config to find libjpeg, if we can
+
 5/1/18 started 8.6.2
 - vips_sink_screen() keeps a ref to the input image ... stops a rare race
 - fix a minor accidental ABI break in 8.6.0 -> 8.6.1 [remicollet]

configure.ac

@@ -1034,23 +1034,40 @@ if test x"$with_png" != "xno"; then
   )
 fi
 
-FIND_JPEG(
+# look for libjpeg with pkg-config ... fall back to our tester
-  [with_jpeg=yes
+AC_ARG_WITH([jpeg], 
-   EXTRA_LIBS_USED="$EXTRA_LIBS_USED -ljpeg"
+  AS_HELP_STRING([--without-jpeg], [build without libjpeg (default: test)]))
-  ],
-  [AC_MSG_WARN([libjpeg not found; disabling JPEG support])
-   with_jpeg=no
-  ]
-)
 
-# JPEG extension parameters available in libjpeg-turbo >=1.5.0, mozjpeg >=3.0
+if test x"$with_jpeg" != x"no"; then
+  PKG_CHECK_MODULES(JPEG, libjpeg,
+    [with_jpeg="yes (pkg-config)"
+     PACKAGES_USED="$PACKAGES_USED libjpeg"
+    ],
+    [FIND_JPEG(
+       [with_jpeg="yes (found by search)"
+	EXTRA_LIBS_USED="$EXTRA_LIBS_USED -ljpeg"
+       ],
+       [AC_MSG_WARN([libjpeg not found; disabling JPEG support])
+        with_jpeg=no
+       ]
+     )
+    ]
+  )
+fi
+
+# features like trellis quant are exposed as extension parameters ...
+# mozjpeg 3.2 and later have #define JPEG_C_PARAM_SUPPORTED, but we must 
+# work with earlier versions
 if test x"$with_jpeg" != "xno"; then
   save_LIBS="$LIBS"
-  LIBS="$LIBS $JPEG_LIBS"
+  save_CFLAGS="$CFLAGS"
+  LIBS="$JPEG_LIBS $LIBS"
+  CFLAGS="$JPEG_INCLUDES $CFLAGS"
   AC_CHECK_FUNCS(jpeg_c_bool_param_supported,
     AC_DEFINE(HAVE_JPEG_EXT_PARAMS,1,
 	      [define if your libjpeg has extension parameters.]))
   LIBS="$save_LIBS"
+  CFLAGS="$save_CFLAGS"
 fi
 
 # libexif