screen: disable compilation for non-Mac Darwin flavors

diff --git a/configure.ac b/configure.ac
index 39a5f25701ea293d19cbea19ef2b20526e5c090b..6b44139d2fe35a7d6f79a9650d7421b77d9f7264 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1892,13 +1892,12 @@ AC_ARG_ENABLE(screen,
     [disable screen capture (default enabled)])])
 if test "${enable_screen}" != "no"; then
   if test "${SYS}" = "darwin"; then
-    AC_CHECK_HEADERS(OpenGL/gl.h, [
-      AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [
-        VLC_ADD_PLUGIN([screen])
-      ])
+    AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [
+      VLC_ADD_PLUGIN([screen])
     ])
   fi
 fi
+AM_CONDITIONAL(HAVE_MAC_SCREEN, [test "${SYS}" = "darwin" -a "x${enable_screen}" != "xno"])
 
 dnl
 dnl  VNC/RFB access module

diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 68285777a01004e342963aa0c046fcff2478f4c9..864992aaffbc14ad244c7ec7abb21d99ce00617e 100755 (executable)
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -199,7 +199,6 @@ fi
     --disable-caca \
     --disable-gettext \
     --disable-mpcdec \
-    --disable-screen \
     --disable-upnp \
     --disable-gme \
     --disable-tremor \
@@ -311,6 +310,7 @@ ${VLCROOT}/configure \
     --enable-speex \
     --enable-theora \
     --enable-flac \
+    --disable-screen \
     --disable-freetype \
     --disable-taglib \
     --disable-mmx > ${out} # MMX and SSE support requires llvm which is broken on Simulator

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index dc5d1e28eb7c0d052df2e3dfe6e568ec14866d6e..e6c1b41028b83398818540afdc4483cee3ef9d6c 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -183,7 +183,7 @@ libscreen_plugin_la_SOURCES += screen/win32.c
 libscreen_plugin_la_LIBADD += -lgdi32
 libvlc_LTLIBRARIES += libscreen_plugin.la
 endif
-if HAVE_DARWIN
+if HAVE_MAC_SCREEN
 libscreen_plugin_la_SOURCES += screen/mac.c
 libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS)
 libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServices"