[FFmpeg-devel] [PATCH 1/2] configure: add {test, check, require}_pkg_config_cxx

[Marvin Scholz]

This is necessary to check for C++ only pkg-config dependencies
---
 configure | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/configure b/configure
index 5dd7964fdf..ff26aa2da7 100755
--- a/configure
+++ b/configure
@@ -1551,6 +1551,26 @@ test_pkg_config_cpp(){
         set_sanitized "${name}_incflags" $pkg_incflags
 }
 
+test_pkg_config_cxx(){
+    log test_pkg_config_cxx "$@"
+    name="$1"
+    pkg_version="$2"
+    pkg="${2%% *}"
+    headers="$3"
+    classes="$4"
+    shift 4
+    disable $name
+    test_cmd $pkg_config --exists --print-errors $pkg_version || return
+    pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
+    pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg)
+    pkg_incdir=$($pkg_config --variable=includedir $pkg_config_flags $pkg)
+    check_class_headers_cpp "$headers" "$classes" $pkg_cflags $pkg_libs "$@" &&
+        enable $name &&
+        set_sanitized "${name}_cflags"    $pkg_cflags &&
+        set_sanitized "${name}_incdir"    $pkg_incdir &&
+        set_sanitized "${name}_extralibs" $pkg_libs
+}
+
 check_pkg_config(){
     log check_pkg_config "$@"
     name="$1"
@@ -1565,6 +1585,13 @@ check_pkg_config_cpp(){
         eval add_cflags \$${name}_cflags
 }
 
+check_pkg_config_cxx(){
+    log check_pkg_config_cxx "$@"
+    name="$1"
+    test_pkg_config_cxx "$@" &&
+        eval add_cflags \$${name}_cflags
+}
+
 check_pkg_config_header_only(){
     log check_pkg_config_cpp "$@"
     name="$1"
@@ -1701,6 +1728,12 @@ require_pkg_config_cpp(){
     check_pkg_config_cpp "$@" || die "ERROR: $pkg_version not found using pkg-config$pkg_config_fail_message"
 }
 
+require_pkg_config_cxx(){
+    log require_pkg_config_cxx "$@"
+    pkg_version="$2"
+    check_pkg_config_cxx "$@" || die "ERROR: $pkg_version not found using pkg-config$pkg_config_fail_message"
+}
+
 test_host_cc(){
     log test_host_cc "$@"
     cat > $TMPC

base-commit: ecb7232bac33ebba47e03663e7e5a3517a8e0a5c
-- 
2.39.5 (Apple Git-154)