[FFmpeg-cvslog] configure: fix test_pkg_config_cpp after 1e5acc1b5985c58e

Lynne git at videolan.org
Sat Nov 27 05:46:48 EET 2021


ffmpeg | branch: master | Lynne <dev at lynne.ee> | Sat Nov 27 04:37:39 2021 +0100| [33be4e6ca904201afe8fb99ee245586bb477b40e] | committer: Lynne

configure: fix test_pkg_config_cpp after 1e5acc1b5985c58e

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33be4e6ca904201afe8fb99ee245586bb477b40e
---

 configure | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 92cacbc1e7..4af36bf80a 100755
--- a/configure
+++ b/configure
@@ -1464,12 +1464,14 @@ test_pkg_config_cpp(){
     cond="$4"
     shift 4
     disable $name
-    test_cmd $pkg_config --exists --print-errors $pkg_version || returnddd
+    test_cmd $pkg_config --exists --print-errors $pkg_version || return
     pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
-    pkg_incflags=$($pkg_config --cflags-onyl-I $pkg_config_flags $pkg)
+    pkg_incdir=$($pkg_config --variable=includedir $pkg_config_flags $pkg)
+    pkg_incflags=$($pkg_config --cflags-only-I $pkg_config_flags $pkg)
     test_cpp_condition "$pkg_incdir/$headers" "$cond" "$@" &&
         enable $name &&
         set_sanitized "${name}_cflags" $pkg_cflags &&
+        set_sanitized "${name}_incdir" $pkg_incdir &&
         set_sanitized "${name}_incflags" $pkg_incflags
 }
 



More information about the ffmpeg-cvslog mailing list