5 files changed, 72 insertions, 6 deletions
diff --git a/config.tests/drm_egl_server/drm_egl_server.pro b/config.tests/drm_egl_server/drm_egl_server.pro
new file mode 100644
index 000000000..328354eb2
--- /dev/null
+++ b/config.tests/drm_egl_server/drm_egl_server.pro
@@ -0,0 +1,14 @@
+TARGET = drm_egl_server
+QT = core
+
+!contains(QT_CONFIG, opengl): error("drm_egl_server support requires Qt configured with OpenGL")
+
+!contains(QT_CONFIG, no-pkg-config) {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += egl
+} else {
+    LIBS += -legl
+}
+
+# Input
+SOURCES += main.cpp
diff --git a/config.tests/drm_egl_server/main.cpp b/config.tests/drm_egl_server/main.cpp
new file mode 100644
index 000000000..7ac62bd6d
--- /dev/null
+++ b/config.tests/drm_egl_server/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Compositor.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
+int main()
+{
+#ifdef EGL_MESA_drm_image
+    return 0;
+#else
+#error Requires EGL_MESA_drm_image to be defined
+    return 1;
+#endif
+}
diff --git a/qtwayland.pro b/qtwayland.pro
index 408a9cd34..3a374a1cf 100644
--- a/qtwayland.pro
+++ b/qtwayland.pro
@@ -7,6 +7,7 @@ qtCompileTest(egl)
 qtCompileTest(brcm_egl)
 qtCompileTest(glx)
 qtCompileTest(xcomposite)
+qtCompileTest(drm_egl_server)
 
 load(qt_parts)
 
diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro
index 0b1191919..1d79b2634 100644
--- a/src/plugins/hardwareintegration/client/client.pro
+++ b/src/plugins/hardwareintegration/client/client.pro
@@ -14,6 +14,6 @@ config_xcomposite {
         SUBDIRS += xcomposite-glx
 }
 
-# we should try and resolve all symbols
-# and they should be type deffed if not present
-SUBDIRS += drm-egl-server
+config_drm_egl_server: \
+    SUBDIRS += drm-egl-server
+
diff --git a/src/plugins/hardwareintegration/compositor/compositor.pro b/src/plugins/hardwareintegration/compositor/compositor.pro
index ac59e20f7..3c1ff5d73 100644
--- a/src/plugins/hardwareintegration/compositor/compositor.pro
+++ b/src/plugins/hardwareintegration/compositor/compositor.pro
@@ -13,6 +13,5 @@ config_xcomposite {
         SUBDIRS += xcomposite-glx
 }
 
-# we should try and resolve all symbols
-# and they should be type deffed if not present
-SUBDIRS += drm-egl-server
+config_drm_egl_server: \
+    SUBDIRS += drm-egl-server