macosx: fix recursive inclusion of the compatibility header

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index bf7e7690e2c71cdad3900bb359fe5dde6bfeaef9..fc3429c729f09c5c8011a8bc4e6d08ee76b5d669 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 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
@@ -14,7 +14,7 @@ AC_SUBST(PKGDIR)
 
 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)
@@ -592,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"
   ])
@@ -2504,6 +2504,9 @@ AS_IF([test "${enable_vpx}" != "no"],[
         VLC_ADD_PLUGIN([vpx])
         VLC_ADD_CPPFLAGS([vpx], [${VPX_CFLAGS}])
         VLC_ADD_LIBS([vpx], [${VPX_LIBS}])
+        AC_CHECK_LIB([vpx],[vpx_codec_vp8_dx], [
+            VLC_ADD_CPPFLAGS([vpx], [-DENABLE_VP8_DECODER])
+        ], [], [${VPX_LIBS}])
         AC_CHECK_LIB([vpx],[vpx_codec_vp9_dx], [
             VLC_ADD_CPPFLAGS([vpx], [-DENABLE_VP9_DECODER])
         ], [], [${VPX_LIBS}])
@@ -2667,11 +2670,6 @@ dnl  theora decoder plugin
 dnl
 PKG_ENABLE_MODULES_VLC([THEORA], [], [ogg theoradec >= 1.0 theoraenc], [experimental theora codec], [auto])
 
-dnl
-dnl  dirac encoder plugin
-dnl
-PKG_ENABLE_MODULES_VLC([DIRAC], [], [dirac >= 0.10.0], [dirac encoder], [auto])
-
 dnl
 dnl  schroedinger decoder plugin (for dirac format video)
 dnl
@@ -2750,28 +2748,7 @@ AC_ARG_WITH(x262-tree,
 fi
 
 dnl x265 encoder
-AC_ARG_ENABLE(x265,
-  AS_HELP_STRING([--enable-x265],[H265 / HEVC encoding support with libx265 (default enabled)]))
-AS_IF( [test "${enable_x265}" != "no"],[
-  AC_PREPROC_IFELSE([AC_LANG_SOURCE([
-#include <x265.h>
-#if X265_BUILD != 4
-# error Fail
-#endif
-  ])], [
-    AC_CHECK_LIB([x265],[x265_encoder_open_4], [
-      VLC_ADD_PLUGIN([x265])
-      VLC_ADD_LIBS([x265], [-lx265 -lstdc++ -lm -lpthread])
-    ], [
-      AC_MSG_ERROR([x265 library not found])
-    ], [-lstdc++ -lm -lpthread])
-  ], [
-    AS_IF([test "${enable_x265}" = "yes"], [
-        AC_MSG_ERROR([x265.h not found])
-    ])
-  ])
-])
-
+PKG_ENABLE_MODULES_VLC([X265],, [x265], [HEVC/H.265 encoder], [auto])
 
 dnl
 dnl H264 encoder plugin (10-bit lib264)
@@ -2987,16 +2964,17 @@ PKG_CHECK_MODULES([GL], [gl], [
     [#include <GL/gl.h>]], [
     [int t0 = GL_TEXTURE0;]])
   ], [
-    have_gl="yes"
     GL_CFLAGS=""
-    AS_IF([test "${SYS}" = "mingw32"], [
+    AS_IF([test "${SYS}" != "mingw32"], [
+      have_gl="yes"
+      GL_LIBS="-lGL"
+    ], [
       AC_CHECK_HEADER([GL/glew.h], [
+        have_gl="yes"
       ], [
         have_gl="no"
       ])
       GL_LIBS="-lopengl32"
-    ], [
-      GL_LIBS="-lGL"
     ])
   ], [
     have_gl="no"
@@ -3256,6 +3234,8 @@ if test "${enable_android_surface}" = "yes"; then
   if test "${HAVE_ANDROID}" = "1"; then
      VLC_ADD_PLUGIN([android_surface])
      VLC_ADD_LIBS([android_surface], [-ldl])
+     VLC_ADD_PLUGIN([android_opaque])
+     VLC_ADD_LIBS([android_opaque], [-ldl])
   fi
 fi