httplive: Adjust conditions for playlist reloading

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2c3d8c89204be0f12f52b1181472991a143f1271..7d0a8ab7abcdf4aa549863df4d1584b1d1a4ebcf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
 dnl Autoconf settings for vlc
 

-AC_COPYRIGHT([Copyright 2002-2013 VLC authors and VideoLAN])
+AC_COPYRIGHT([Copyright 2002-2014 VLC authors and VideoLAN])

 
 AC_INIT(vlc, 2.2.0-git)
 VERSION_MAJOR=2
 
 AC_INIT(vlc, 2.2.0-git)
 VERSION_MAJOR=2


@@ -14,7 +14,7 @@ AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Weatherwax"
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Weatherwax"

-COPYRIGHT_YEARS="1996-2013"
+COPYRIGHT_YEARS="1996-2014"

 
 AC_CONFIG_SRCDIR(src/libvlc.c)
 AC_CONFIG_AUX_DIR(autotools)
 
 AC_CONFIG_SRCDIR(src/libvlc.c)
 AC_CONFIG_AUX_DIR(autotools)


@@ -73,6 +73,7 @@ AM_PROG_AS
 
 AC_ARG_VAR([DESKTOP_FILE_VALIDATE], [Validator for desktop entry files])
 AC_CHECK_PROGS(DESKTOP_FILE_VALIDATE, [${DESKTOP_FILE_VALIDATE} desktop-file-validate], :)
 
 AC_ARG_VAR([DESKTOP_FILE_VALIDATE], [Validator for desktop entry files])
 AC_CHECK_PROGS(DESKTOP_FILE_VALIDATE, [${DESKTOP_FILE_VALIDATE} desktop-file-validate], :)

+AC_CHECK_PROGS(YASM, yasm)

 
 dnl Check for compiler properties
 AC_C_CONST
 
 dnl Check for compiler properties
 AC_C_CONST


@@ -96,6 +97,18 @@ dnl
 dnl  Check the operating system
 dnl
 HAVE_WIN64="0"
 dnl  Check the operating system
 dnl
 HAVE_WIN64="0"

+
+YASMFLAGS=""
+case "${host}" in
+    i?86*)
+    YASMFLAGS="-f elf32"
+        ;;
+    x86_64*)
+    YASMFLAGS="-f elf64"
+        ;;
+esac
+
+

 case "${host_os}" in
   "")
     SYS=unknown
 case "${host_os}" in
   "")
     SYS=unknown


@@ -131,6 +144,7 @@ case "${host_os}" in
     case "${host}" in
       i?86*)
         ARCH_flag="-arch i386"
     case "${host}" in
       i?86*)
         ARCH_flag="-arch i386"

+        YASMFLAGS="-f macho32"

       ;;
       ppc64*)
         ARCH_flag="-arch ppc64"
       ;;
       ppc64*)
         ARCH_flag="-arch ppc64"


@@ -140,6 +154,7 @@ case "${host_os}" in
       ;;
       x86_64*)
         ARCH_flag="-arch x86_64"
       ;;
       x86_64*)
         ARCH_flag="-arch x86_64"

+        YASMFLAGS="-f macho64"

       ;;
       arm*)
         ac_cv_c_bigendian="no"
       ;;
       arm*)
         ac_cv_c_bigendian="no"


@@ -237,10 +252,12 @@ case "${host_os}" in
                 HAVE_WIN64="1"
                 WINDOWS_ARCH="x64"
                 PROGRAMFILES="PROGRAMFILES64"
                 HAVE_WIN64="1"
                 WINDOWS_ARCH="x64"
                 PROGRAMFILES="PROGRAMFILES64"

+                YASMFLAGS="-f win64"

             ;;
             *)
                 WINDOWS_ARCH="x86"
                 PROGRAMFILES="PROGRAMFILES"
             ;;
             *)
                 WINDOWS_ARCH="x86"
                 PROGRAMFILES="PROGRAMFILES"

+                YASMFLAGS="-f win32"

             ;;
         esac
         AC_SUBST(WINDOWS_ARCH)
             ;;
         esac
         AC_SUBST(WINDOWS_ARCH)


@@ -275,6 +292,8 @@ AM_CONDITIONAL(HAVE_WIN32,   test "${SYS}" = "mingw32")
 AM_CONDITIONAL(HAVE_WIN64,   test "${HAVE_WIN64}" = "1")
 AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
 
 AM_CONDITIONAL(HAVE_WIN64,   test "${HAVE_WIN64}" = "1")
 AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
 

+AC_SUBST(YASMFLAGS)
+

 dnl
 dnl Sadly autoconf does not think about testing foo.exe when ask to test
 dnl for program foo on win32
 dnl
 dnl Sadly autoconf does not think about testing foo.exe when ask to test
 dnl for program foo on win32


@@ -573,7 +592,7 @@ AC_SEARCH_LIBS(connect, [socket], [
   ])
 ])
 
   ])
 ])
 

-AC_SEARCH_LIBS([getaddrinfo], [nsl], [
+AC_SEARCH_LIBS([inet_pton], [nsl], [

  AS_IF([test "$ac_cv_search_getaddrinfo" != "none required"], [
     SOCKET_LIBS="$ac_cv_search_getaddrinfo $SOCKET_LIBS"
   ])
  AS_IF([test "$ac_cv_search_getaddrinfo" != "none required"], [
     SOCKET_LIBS="$ac_cv_search_getaddrinfo $SOCKET_LIBS"
   ])


@@ -1676,7 +1695,7 @@ AS_IF([test "${enable_dvdnav}" != "no"], [
 dnl
 dnl  Blu-ray Disc Support with libbluray
 dnl
 dnl
 dnl  Blu-ray Disc Support with libbluray
 dnl

-PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2.1], (libbluray for Blu-ray disc support ) )
+PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.3.0], (libbluray for Blu-ray disc support ) )

 
 dnl
 dnl  OpenCV wrapper and example filters
 
 dnl
 dnl  OpenCV wrapper and example filters


@@ -1898,6 +1917,23 @@ then
 fi
 AM_CONDITIONAL(HAVE_AVFOUNDATION, [test "${have_avfoundation}" != "no"])
 
 fi
 AM_CONDITIONAL(HAVE_AVFOUNDATION, [test "${have_avfoundation}" != "no"])
 

+dnl
+dnl  DCP plugin (using asdcplib)
+dnl
+AC_ARG_ENABLE(dcp,
+  AS_HELP_STRING([--enable-dcp],[Digital Cinema Package support using asdcplib (default auto)]))
+have_asdcp="no"
+AS_IF([test "x${enable_dcp}" != "no"], [
+  AC_LANG_PUSH(C++)
+  AC_CHECK_HEADERS( [[AS@&t@_DCP.h]],
+    [have_asdcp="yes"],
+    [AS_IF( [test "x${enable_dcp}" = "yes"],
+      [AC_MSG_ERROR( [ ASDCP library cannot be found (needed for dcp module). Either use --enable-dcp=no or install asdcp library: http://www.cinecert.com/asdcplib/download/] )])
+     ])
+  AC_LANG_POP(C++)
+])
+AM_CONDITIONAL(HAVE_ASDCP, [test "${have_asdcp}" != "no"])
+

 dnl
 dnl  Demux plugins
 dnl
 dnl
 dnl  Demux plugins
 dnl


@@ -2657,6 +2693,17 @@ AC_CHECK_HEADERS(png.h, [
   ])
 ])
 
   ])
 ])
 

+dnl
+dnl  JPEG decoder module
+dnl
+AC_ARG_ENABLE(jpeg,
+  [  --enable-jpeg           JPEG support (default enabled)])
+AS_IF([test "${enable_jpeg}" != "no"], [
+AC_CHECK_HEADERS(jpeglib.h, [
+  VLC_ADD_PLUGIN([jpeg])
+  ])
+])
+

 dnl
 dnl H262 encoder plugin (lib262)
 dnl
 dnl
 dnl H262 encoder plugin (lib262)
 dnl


@@ -2708,11 +2755,11 @@ AC_ARG_ENABLE(x265,
 AS_IF( [test "${enable_x265}" != "no"],[
   AC_PREPROC_IFELSE([AC_LANG_SOURCE([
 #include <x265.h>
 AS_IF( [test "${enable_x265}" != "no"],[
   AC_PREPROC_IFELSE([AC_LANG_SOURCE([
 #include <x265.h>

-#if X265_BUILD != 1
+#if X265_BUILD != 4

 # error Fail
 #endif
   ])], [
 # error Fail
 #endif
   ])], [

-    AC_CHECK_LIB([x265],[x265_encoder_open_1], [
+    AC_CHECK_LIB([x265],[x265_encoder_open_4], [

       VLC_ADD_PLUGIN([x265])
       VLC_ADD_LIBS([x265], [-lx265 -lstdc++ -lm -lpthread])
     ], [
       VLC_ADD_PLUGIN([x265])
       VLC_ADD_LIBS([x265], [-lx265 -lstdc++ -lm -lpthread])
     ], [


@@ -2926,10 +2973,20 @@ EXTEND_HELP_STRING([Video plugins:])
 dnl
 dnl  OpenGL
 dnl
 dnl
 dnl  OpenGL
 dnl

+PKG_CHECK_MODULES([EGL], [egl], [
+  have_egl="yes"
+], [
+  have_egl="no"
+])
+AM_CONDITIONAL([HAVE_EGL], [test "${have_egl}" = "yes"])
+

 PKG_CHECK_MODULES([GL], [gl], [
   have_gl="yes"
 ], [
 PKG_CHECK_MODULES([GL], [gl], [
   have_gl="yes"
 ], [

-  AC_CHECK_HEADER([GL/gl.h], [
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+    [#include <GL/gl.h>]], [
+    [int t0 = GL_TEXTURE0;]])
+  ], [

     have_gl="yes"
     GL_CFLAGS=""
     AS_IF([test "${SYS}" = "mingw32"], [
     have_gl="yes"
     GL_CFLAGS=""
     AS_IF([test "${SYS}" = "mingw32"], [


@@ -2952,16 +3009,6 @@ 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], [disabled])
 
 dnl OpenGL ES 1: depends on EGL 1.0
 PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [disabled])
 

-AC_ARG_ENABLE(egl,
-  [  --enable-egl            OpenGL support through EGL (default disabled)],, [
-  enable_egl="no"
-])
-AS_IF([test "$enable_egl" != "no"], [
-  PKG_CHECK_MODULES([EGL], [egl], [
-    VLC_ADD_PLUGIN([egl])
-  ])
-])
-

 dnl
 dnl  Xlib
 dnl
 dnl
 dnl  Xlib
 dnl


@@ -3213,17 +3260,6 @@ if test "${enable_android_surface}" = "yes"; then
 fi
 
 
 fi
 
 

-dnl
-dnl  iOS vout module
-dnl
-AC_ARG_ENABLE(ios-vout,
-  [  --enable-ios-vout    iOS video output module (default disabled)])
-if test "${enable_ios_vout}" = "yes"
-then
-  VLC_ADD_PLUGIN([vout_ios])
-  VLC_ADD_LIBS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation])
-fi
-

 dnl
 dnl  iOS ES2 vout module
 dnl
 dnl
 dnl  iOS ES2 vout module
 dnl