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

1345a357 · Damien Fouilleul · ef7599ee · 1345a357
Commit 1345a357 authored Jul 23, 2007 by Damien Fouilleul
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 10 deletions

configure.ac configure.ac +14 -10

No files found.
--- 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