From: Gildas Bazin <gbazin@videolan.org>
Date: Sun, 25 May 2003 20:16:26 +0000 (+0000)
Subject: * configure.ac.in, modules/video_output/x11/xcommon.c: fixed configure check for... 
X-Git-Tag: 0.6.0~191
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=31f8428f7b9755eaaf335d291ca6f8048303ddca;p=vlc

* configure.ac.in, modules/video_output/x11/xcommon.c: fixed configure check for the Xinerama extension.
---

diff --git a/configure.ac.in b/configure.ac.in
index 76a3f694ea..172281a319 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1976,9 +1976,11 @@ if test "x${enable_x11}" != "xno" &&
     LDFLAGS_x11="${LDFLAGS_x11} -L${x_libraries} -lX11 -lXext"
     CPPFLAGS_x11="${CPPFLAGS_x11} -I${x_includes}"
     AC_CHECK_HEADERS(X11/extensions/Xinerama.h, [
+      CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext"
       AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
         AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
         LDFLAGS_x11="${LDFLAGS_x11} -lXinerama")
+      CFLAGS="${CFLAGS_save}"
     ])
   ])
   CPPFLAGS="${CPPFLAGS_save}"
diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index 8ba538f390..f5f74f0ac3 100644
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -2,7 +2,7 @@
  * xcommon.c: Functions common to the X11 and XVideo plugins
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: xcommon.c,v 1.17 2003/05/25 19:24:53 gbazin Exp $
+ * $Id: xcommon.c,v 1.18 2003/05/25 20:16:26 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -1338,7 +1338,10 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
     XEvent xevent;
     mwmhints_t mwmhints;
     XSetWindowAttributes attributes;
+
+#ifdef HAVE_XINERAMA
     int i_d1, i_d2;
+#endif
 
     p_vout->b_fullscreen = !p_vout->b_fullscreen;