[FFmpeg-devel] [RFC]Use pkg-config as an alternative for x264 detection

[Carl Eugen Hoyos]

Hi!

Would attached (not well tested) make the pkg-config junkies happier?

Please understand that switching to pkg-config as a requirement 
will produce a shitload of user reports that I would really 
like to avoid.

Please comment, Carl Eugen
-------------- next part --------------
diff --git a/configure b/configure
index fa66c4f..4dea7fb 100755
--- a/configure
+++ b/configure
@@ -4718,7 +4718,8 @@ enabled libvpx            && {
     enabled libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_SVC" -lvpx || disable libvpx_vp9_encoder; } }
 enabled libwavpack        && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput  -lwavpack
 enabled libwebp           && require_pkg_config libwebp webp/encode.h WebPGetEncoderVersion
-enabled libx264           && require libx264 x264.h x264_encoder_encode -lx264 &&
+enabled libx264           && { require libx264 x264.h x264_encoder_encode -lx264 ||
+                               require_pkg_config x264 "stdint.h x264.h" x264_encoder_encode; } &&
                              { check_cpp_condition x264.h "X264_BUILD >= 118" ||
                                die "ERROR: libx264 must be installed and version must be >= 0.118."; }
 enabled libx265           && require_pkg_config x265 x265.h x265_encoder_encode &&