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

diff --git a/configure.ac.in b/configure.ac.in
index 76a3f694ea48a3534799a0b455d08351ecdaabd1..172281a319211e6f536b99645fe4cf7725149f2a 100644 (file)
--- 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 8ba538f390d937e2242da160ee1b33e0f42e88a7..f5f74f0ac3d8cd1272dd2679f2b9c23c0f8e0a91 100644 (file)
--- 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;