Commit b0152eca authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Simply X11 Qt4 error detection

parent 64b1b518
...@@ -5187,9 +5187,6 @@ AS_IF([test "${enable_qt4}" != "no" && ...@@ -5187,9 +5187,6 @@ AS_IF([test "${enable_qt4}" != "no" &&
[ VLC_ADD_PLUGINS([qt4]) [ VLC_ADD_PLUGINS([qt4])
ALIASES="${ALIASES} qvlc" ALIASES="${ALIASES} qvlc"
enableqt4=true enableqt4=true
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin"; then
AC_CHECK_HEADERS([X11/Xlib.h],[],[AC_MSG_ERROR([You need X11 headers])])
fi
VLC_ADD_LIBS([qt4],[$QT4_LIBS]) VLC_ADD_LIBS([qt4],[$QT4_LIBS])
VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"]) VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"])
AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
......
...@@ -180,19 +180,13 @@ static int Open( vlc_object_t *p_this ) ...@@ -180,19 +180,13 @@ static int Open( vlc_object_t *p_this )
{ {
intf_thread_t *p_intf = (intf_thread_t *)p_this; intf_thread_t *p_intf = (intf_thread_t *)p_this;
p_intf->pf_run = Run; p_intf->pf_run = Run;
#if defined HAVE_GETENV && defined Q_WS_X11 && defined HAVE_X11_XLIB_H #if defined Q_WS_X11 && defined HAVE_X11_XLIB_H
char *psz_display = getenv( "DISPLAY" );
if( !psz_display || !*psz_display )
{
msg_Err( p_intf, "no X server" );
return VLC_EGENERIC;
}
/* Thanks for libqt4 calling exit() in QApplication::QApplication() /* Thanks for libqt4 calling exit() in QApplication::QApplication()
* instead of returning an error, we have to check for DISPLAY validity */ * instead of returning an error, we have to check the X11 display */
Display *p_display = XOpenDisplay( psz_display ); Display *p_display = XOpenDisplay( NULL );
if( !p_display ) if( !p_display )
{ {
msg_Err( p_intf, "Could not connect to X server %s", psz_display ); msg_Err( p_intf, "Could not connect to X server" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
XCloseDisplay( p_display ); XCloseDisplay( p_display );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment