- configure.ac: only tests for Osso and Xdsp if X11 is available

diff --git a/configure.ac b/configure.ac
index e01ce519ba80aed7bdeaaba12adfa7f92f37bb24..506ddcce5395a34fcc68426c5ac4d17838bf2cb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5787,17 +5787,21 @@ fi
 AC_LANG_POP(C++)
 AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
 
-dnl Tests for Osso and Xsp
-AC_CHECK_LIB(osso, osso_display_blanking_pause,[
-   PKG_CHECK_MODULES(GLIB2, glib-2.0, [                                                  
-       VLC_ADD_CPPFLAGS([x11],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
-       VLC_ADD_LDFLAGS([x11],[-losso])
+   dnl Tests for Osso and Xsp
+if test "${enable_x11}" != "no" &&
+  (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
+   test "${enable_x11}" = "yes"); then
+   AC_CHECK_LIB(osso, osso_display_blanking_pause,[
+      PKG_CHECK_MODULES(GLIB2, glib-2.0, [                                               
+          VLC_ADD_CPPFLAGS([x11],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
+          VLC_ADD_LDFLAGS([x11],[-losso])
+      ])
    ])
-])
-AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
-   VLC_ADD_CPPFLAGS([x11],[-DHAVE_XSP])
-   VLC_ADD_LDFLAGS([x11],[-lXsp])
-])
+   AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
+      VLC_ADD_CPPFLAGS([x11],[-DHAVE_XSP])
+      VLC_ADD_LDFLAGS([x11],[-lXsp])
+   ])
+fi
 
 dnl
 dnl  Mediacontrol Python bindings