msdk: Allow building against mfx_dispatcher

E.g. from https://github.com/lu-zero/mfx_dispatch

1 files changed, 38 insertions, 26 deletions

diff --git a/configure.ac b/configure.ac
index f9520e34d..3b5c4fbe3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2065,35 +2065,47 @@ AG_GST_CHECK_FEATURE(TINYALSA, [tinyalsa], tinyalsa, [
 dnl check for intel mediasdk
 translit(dnm, m, l) AM_CONDITIONAL(USE_MSDK, true)
 AG_GST_CHECK_FEATURE(MSDK, [Intel MediaSDK], msdk, [
-  AC_ARG_WITH([msdk-prefix],
-          AS_HELP_STRING([--with-msdk-prefix],
-          [Use the provided prefix for detecting the Intel MediaSDK]),
-          [AS_IF([test "x$with_msdk_prefix" != "x"],
-                 [MSDK_PREFIX="$with_msdk_prefix"])],
-          [AS_IF([test "x$MFX_HOME" != "x"],
-                 [MSDK_PREFIX="$MFX_HOME"],
-                 [MSDK_PREFIX="/opt/intel/media"])])
-  MSDK_CFLAGS="-I$MSDK_PREFIX/include"
-  MSDK_LIBS="-L$MSDK_PREFIX/lib/lin_x64 -lmfx -ldl"
-  AC_SUBST(MSDK_CFLAGS)
-  AC_SUBST(MSDK_LIBS)
-
-  save_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$MSDK_CFLAGS $save_CPPFLAGS"
-  AC_CHECK_HEADER(mfxdefs.h, HAVE_MFXDEFS_H="yes", HAVE_MFXDEFS_H="no")
-  CPPFLAGS="$save_CPPFLAGS"
-
-  save_LIBS="$LIBS"
-  LIBS="$MSDK_LIBS $LIBS"
-  AC_LANG_PUSH([C++])
-  AC_CHECK_LIB(mfx,MFXInit,HAVE_MFX_LIB="yes",HAVE_MFX_LIB="no")
-  AC_LANG_POP([C++])
-  LIBS="$save_LIBS"
+  PKG_CHECK_MODULES(LIBMFX, libmfx,
+  [
+    AC_DEFINE(HAVE_LIBMFX, 1, [Define if mfx_dispatcher is available])
+    HAVE_MSDK="yes"
+  ], [
+    AC_ARG_WITH([msdk-prefix],
+            AS_HELP_STRING([--with-msdk-prefix],
+            [Use the provided prefix for detecting the Intel MediaSDK]),
+            [AS_IF([test "x$with_msdk_prefix" != "x"],
+                   [MSDK_PREFIX="$with_msdk_prefix"])],
+            [AS_IF([test "x$MFX_HOME" != "x"],
+                   [MSDK_PREFIX="$MFX_HOME"],
+                   [MSDK_PREFIX="/opt/intel/media"])])
+    MSDK_CFLAGS="-I$MSDK_PREFIX/include"
+    MSDK_LIBS="-L$MSDK_PREFIX/lib/lin_x64 -lmfx -ldl"
+    AC_SUBST(MSDK_CFLAGS)
+    AC_SUBST(MSDK_LIBS)
+
+    save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$MSDK_CFLAGS $save_CPPFLAGS"
+    AC_CHECK_HEADER(mfxdefs.h, HAVE_MFXDEFS_H="yes", HAVE_MFXDEFS_H="no")
+    CPPFLAGS="$save_CPPFLAGS"
+
+    save_LIBS="$LIBS"
+    LIBS="$MSDK_LIBS $LIBS"
+    AC_LANG_PUSH([C++])
+    AC_CHECK_LIB(mfx,MFXInit,HAVE_MFX_LIB="yes",HAVE_MFX_LIB="no")
+    AC_LANG_POP([C++])
+    LIBS="$save_LIBS"
+
+    if test "x$HAVE_MFXDEFS_H" = "xyes" \
+        -a "x$HAVE_MFX_LIB" = "xyes"; then
+      HAVE_MSDK="yes"
+    else
+      HAVE_MSDK="no"
+    fi
+  ])
 
   PKG_CHECK_MODULES(LIBVA_DRM, libva-drm, HAVE_LIBVA_DRM="yes", HAVE_LIBVA_DRM="no")
 
-  if test "x$HAVE_MFXDEFS_H" = "xyes" \
-      -a "x$HAVE_MFX_LIB" = "xyes" \
+  if test "x$HAVE_MSDK" = "xyes" \
       -a "x$HAVE_LIBVA_DRM" = "xyes"; then
     HAVE_MSDK="yes"
   else