]> git.sesse.net Git - vlc/commitdiff
* Apply --enable-xinerama patch by Diego Petteno <flameeyes at gentoo dot org>
authorDerk-Jan Hartman <hartman@videolan.org>
Wed, 1 Mar 2006 16:50:08 +0000 (16:50 +0000)
committerDerk-Jan Hartman <hartman@videolan.org>
Wed, 1 Mar 2006 16:50:08 +0000 (16:50 +0000)
This is not 100% tested, but only compared against similar situations.

configure.ac

index c798e8d4a67c61df10dbcb6550ef01911130657c..38edf0437b311d9fcb6680f3bee5ec158647a2be 100644 (file)
@@ -3459,12 +3459,14 @@ if test "${enable_glx}" != "no" &&
   CPPFLAGS="${CPPFLAGS_save}"
 fi
 
-if test "${enable_xvideo}" != "no" &&
-  (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
-   test "${enable_xvideo}" = "yes"); then
 dnl
 dnl  Check for the Xinerama extension
 dnl
+AC_ARG_ENABLE(xinerama,
+  [  --enable-xinerama       Xinerama support (default enabled)])
+if test "${enable_xvideo}" != "no" && test "${enable_xinerama}" != "no" &&
+  (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
+   test "${enable_xvideo}" = "yes"); then
   ac_cv_have_xinerama="no"
   CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
   CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext"