From b9d0b6933875005a5b1f17a53e29240faf4a440e Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 14 Dec 2016 15:21:28 +0100
Subject: Fix Linux audio library detection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The configure checks where moved to QtMultimedia which we do not depend
on, therefore we need to now duplicate the checks ourselves.

Task-number: QTBUG-57620
Change-Id: I6f7319c7e91e3f51baf012c669121389cd6e1360
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 configure.json | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index 63abd1dba..22870a0eb 100644
--- a/configure.json
+++ b/configure.json
@@ -1,14 +1,45 @@
 {
     "module": "webengine",
 
+    "testDir": "tools/qmake/config.tests",
+
     "commandline": {
         "options": {
+            "alsa": "boolean",
             "proprietary-codecs": "boolean",
+            "pulseaudio": "boolean",
             "spellchecker": "boolean"
         }
     },
 
+    "libraries": {
+        "alsa": {
+            "label": "ALSA",
+            "test": "alsa",
+            "sources": [
+                "-lasound"
+            ]
+        },
+        "pulseaudio": {
+            "label": "PulseAudio >= 0.9.10",
+            "sources": [
+                { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" }
+            ]
+        }
+    },
+
     "features": {
+        "alsa": {
+            "label": "ALSA",
+            "condition": "config.unix && libs.alsa",
+            "output": [ "privateFeature" ]
+        },
+        "pulseaudio": {
+            "label": "PulseAudio",
+            "autoDetect": "config.unix",
+            "condition": "libs.pulseaudio",
+            "output": [ "privateFeature" ]
+        },
         "proprietary-codecs": {
             "label": "Proprietary Codecs",
             "autoDetect": false,
@@ -27,7 +58,17 @@
             "section": "Qt WebEngine",
             "entries": [
                 "proprietary-codecs",
-                "spellchecker"
+                "spellchecker",
+                {
+                    "type": "feature",
+                    "args": "alsa",
+                    "condition": "config.unix"
+                },
+                {
+                    "type": "feature",
+                    "args": "pulseaudio",
+                    "condition": "config.unix"
+                }
             ]
         }
     ]
-- 
cgit v1.2.3