From df5349bc76bd8371973eca6c51ad426ce6655bb4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 12 Dec 2009 18:41:42 +0200 Subject: [PATCH] Remove useless header check --- configure.ac | 20 -------------------- modules/gui/qt4/qt4.cpp | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index 0af62e8208..aa556f8b7d 100644 --- a/configure.ac +++ b/configure.ac @@ -269,8 +269,6 @@ case "${host_os}" in enable_skins2="no" echo " Assuming --disable-skins2" - enable_x11="no" - echo " Assuming --disable-x11" enable_xcb="no" echo " Assuming --disable-xcb" fi @@ -3609,24 +3607,6 @@ dnl Xlib dnl AC_PATH_XTRA() -AC_ARG_ENABLE(x11, - [ --enable-x11 X11 support with Xlib (default enabled)],, [ - AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ - enable_x11="yes" - ], [ - enable_x11="no" - ]) -]) - -CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" - -AS_IF([test "${enable_x11}" != "no"], [ - AC_CHECK_HEADERS(X11/Xlib.h) -]) - -dnl End of Xlib tests -CPPFLAGS="${CPPFLAGS_save}" - dnl dnl X C Bindings modules diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 5675d9053b..b804f507f8 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -38,7 +38,7 @@ #include "recents.hpp" /* Recents Item destruction */ #include "util/qvlcapp.hpp" /* QVLCApplication definition */ -#ifdef HAVE_X11_XLIB_H +#ifdef Q_WS_X11 #include #endif -- 2.39.2