libvlc: deinit actions in reverse order of init

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index ac10739140f3e06344d989ce0a6727a9bb661a71..994705048ca5b4538d60e95052da95f98b763cef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -204,6 +204,10 @@ case "${host_os}" in
   *mingw32* | *cygwin* | *wince* | *mingwce*)
     AC_CHECK_TOOL(WINDRES, windres, :)
     AC_CHECK_TOOL(OBJCOPY, objcopy, :)
+    AC_PATH_PROGS(GENDEF,[${GENDEF} gendef], [false])
+    AS_IF([test "${GENDEF}" = "false"], [
+        AC_MSG_ERROR([Could not find gendef.])
+    ])
     AH_TOP([#if defined(WIN32) && !defined(_WIN32_WINNT)])
     AH_TOP([# define _WIN32_WINNT 0x0502 /* Windows XP SP2 */])
     AH_TOP([#endif])
@@ -442,10 +446,12 @@ dnl Check for broken versions of mingw-runtime compatability library
     CPPFLAGS="${CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=1"
 
 dnl Check for the need to include the mingwex lib for mingw32
+    VLC_SAVE_FLAGS
     AC_CHECK_LIB(mingwex,opendir,
         AC_CHECK_LIB(mingw32,opendir,,
             [VLC_ADD_LIBS([libvlccore],[-lmingwex])])
     )
+    VLC_RESTORE_FLAGS
 
 dnl Check for fnative-struct or mms-bitfields support for mingw32
     VLC_SAVE_FLAGS
@@ -1884,6 +1890,11 @@ if test "${enable_screen}" != "no"; then
   fi
 fi
 
+dnl
+dnl  VNC/RFB access module
+dnl
+PKG_ENABLE_MODULES_VLC([LIBVNC], [libvnc], [libvncclient >= 0.9.9], (VNC/rfb client support), [auto])
+
 dnl
 dnl  Real RTSP plugin
 dnl
@@ -2111,6 +2122,27 @@ then
   VLC_ADD_PLUGIN([omxil])
 fi
 
+dnl
+dnl openmax il vout plugin
+dnl
+AC_ARG_ENABLE(omxil-vout,
+  [  --enable-omxil-vout     openmax il video output module (default disabled)])
+if test "${enable_omxil_vout}" = "yes"
+then
+  VLC_ADD_PLUGIN([omxil_vout])
+fi
+
+dnl
+dnl raspberry pi openmax il configuration
+dnl
+AC_ARG_ENABLE(rpi-omxil,
+  [  --enable-rpi-omxil     openmax il configured for raspberry pi (default disabled)])
+if test "${enable_rpi_omxil}" = "yes"
+then
+  VLC_ADD_PLUGIN([omxil omxil_vout])
+  VLC_ADD_CFLAGS([omxil omxil_vout],[-DRPI_OMX])
+fi
+
 dnl
 dnl CrystalHD codec plugin
 dnl
@@ -2220,11 +2252,6 @@ AC_ARG_ENABLE(avcodec,
 [  --enable-avcodec        libavcodec codec (default enabled)])
 AS_IF([test "${enable_avcodec}" != "no"], [
   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
-    AS_IF([test "${enable_sout}" != "no"], [
-      PKG_CHECK_EXISTS([libavcodec < 55],, [
-        AC_MSG_ERROR([libavcodec version 55 requires --disable-sout.])
-      ])
-    ])
     PKG_CHECK_EXISTS([libavcodec < 56],, [
       AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
     ])
@@ -2898,9 +2925,9 @@ PKG_CHECK_MODULES([GL], [gl], [
 ])
 
 dnl OpenGL ES 2: depends on EGL 1.1
-PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [auto])
+PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [disabled])
 dnl OpenGL ES 1: depends on EGL 1.0
-PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [auto])
+PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [disabled])
 
 AC_ARG_ENABLE(egl,
   [  --enable-egl            OpenGL support through EGL (default disabled)],, [