]> git.sesse.net Git - vlc/blobdiff - configure.ac
dvdnav: fix potential buffer read overflow
[vlc] / configure.ac
index e25c92aaf26ec3658f5fc251e1629d46c56ff660..c7196762a75fe222103d2cdb077ef8b582346729 100644 (file)
@@ -33,7 +33,6 @@ dnl If you want to use it, you definitely know what you are doing, so
 dnl you can specify "--disable-maintainer-mode". But if you want the default
 dnl automake behavior, you've likely never heard of maintainer mode, so we
 dnl can't expect you to enable it manually.
-
 AS_IF([test "x${enable_maintainer_mode}" != "xno"],
     [enable_maintainer_mode="yes"])
 AM_MAINTAINER_MODE
@@ -88,12 +87,12 @@ AC_DEFUN([EXTEND_HELP_STRING], [m4_divert_once([HELP_ENABLE], [$1])])
 dnl Allow binary package maintainer to pass a custom string to avoid
 dnl cache problem
 AC_ARG_WITH(binary-version,
-       AS_HELP_STRING([--with-binary-version=STRING],
-            [To avoid plugins cache problem between binary version]),[],[])
+    AS_HELP_STRING([--with-binary-version=STRING],
+         [To avoid plugins cache problem between binary version]),[],[])
 AS_IF([test -n "${with_binary_version}"],[
-      AC_DEFINE_UNQUOTED([DISTRO_VERSION],["${with_binary_version}"],
-                        [Binary specific version])
-      ])
+    AC_DEFINE_UNQUOTED([DISTRO_VERSION],["${with_binary_version}"],
+         [Binary specific version])
+])
 
 
 dnl
@@ -139,9 +138,6 @@ AS_IF([test "${with_contrib}" != "no"],[
     if test -z "$with_mozilla_sdk_path"; then
        with_mozilla_sdk_path="${CONTRIB_DIR}/gecko-sdk"
     fi
-    if test -z "$with_cyberlink_tree"; then
-       with_cyberlink_tree="${CONTRIB_DIR}/src/clinkcc"
-    fi
 
     if test "${SYS}" = "darwin"; then
       export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH"
@@ -155,6 +151,7 @@ AS_IF([test "${with_contrib}" != "no"],[
     CONTRIB_DIR=""
   ])
 ])
+
 dnl
 dnl  Set default values
 dnl
@@ -256,8 +253,6 @@ case "${host_os}" in
         echo "  Assuming --enable-realrtsp"
         enable_libass="yes"
         echo "  Assuming --enable-libass"
-        enable_asademux="yes"
-        echo "  Assuming --enable-asademux"
 
         enable_skins2="no"
         echo "  Assuming --disable-skins2"
@@ -344,7 +339,7 @@ case "${host_os}" in
         AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
         ac_default_prefix="`pwd`/_wince"
         DESTDIR="`pwd`/_wince/"
-   fi
+    fi
     ;;
   *nto*)
     SYS=nto
@@ -445,20 +440,19 @@ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
 #if (__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 15)
 # error Attempting to use mingw-runtime with broken vsnprintf support
 #endif
-], [
+    ], [
         AC_MSG_RESULT([ok])
-], [
+    ], [
         AC_MSG_RESULT([present])
         AC_MSG_ERROR([LibVLC requires mingw-runtime version 3.15 or higher!])
-])
+    ])
     dnl force use of mingw provided c99 *printf over msvcrt
     CPPFLAGS="${CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=1"
     CPPFLAGS_save="${CPPFLAGS_save} -D__USE_MINGW_ANSI_STDIO=1"
 ])
 
 dnl Check for the need to include the mingwex lib for mingw32
-if test "${SYS}" = "mingw32"
-then
+if test "${SYS}" = "mingw32" ; then
     AC_CHECK_LIB(mingwex,opendir,
         AC_CHECK_LIB(mingw32,opendir,,
             [VLC_ADD_LIBS([libvlccore],[-lmingwex])])
@@ -466,8 +460,7 @@ then
 fi
 
 dnl Check for fnative-struct or mms-bitfields support for mingw32
-if test "${SYS}" = "mingw32"
-then
+if test "${SYS}" = "mingw32" ; then
     AC_CACHE_CHECK([if \$CC accepts -mms-bitfields],
         [ac_cv_c_mms_bitfields],
         [CFLAGS="${CFLAGS_save} -mms-bitfields"
@@ -490,9 +483,8 @@ then
 fi
 
 dnl Check for fvtable-thunks support for mingw32
-if test "${SYS}" = "mingw32" -a "${CXX}" != ""
-then
-AC_LANG_PUSH(C++)
+if test "${SYS}" = "mingw32" -a "${CXX}" != "" ; then
+    AC_LANG_PUSH(C++)
     AC_CACHE_CHECK([if \$CXX accepts -fvtable-thunks],
         [ac_cv_cxx_fvtable_thunks],
         [CXXFLAGS="${CXXFLAGS_save} -Wall -Werror -fvtable-thunks"
@@ -503,7 +495,7 @@ AC_LANG_PUSH(C++)
     fi
 
     CXXFLAGS_save="${CXXFLAGS_save} ${CXXFLAGS_mingw32_special}"; CXXFLAGS="${CXXFLAGS_save}"
-AC_LANG_POP(C++)
+    AC_LANG_POP(C++)
 fi
 
 dnl
@@ -751,43 +743,43 @@ fi
 AC_SUBST(LIBDL)
 
 if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
-dnl Check for pthreads - borrowed from XMMS
-THREAD_LIB=error
-if test "${THREAD_LIB}" = "error"; then
-  AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
-fi
-if test "${THREAD_LIB}" = "error"; then
-  AC_CHECK_LIB(pthreads,main,THREAD_LIB="-lpthreads")
-fi
-if test "${THREAD_LIB}" = "error"; then
-  AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r")
-fi
-if test "${THREAD_LIB}" = "error"; then
-  AC_CHECK_FUNCS(pthread_mutex_lock)
-  THREAD_LIB=""
-fi
+  dnl Check for pthreads - borrowed from XMMS
+  THREAD_LIB=error
+  if test "${THREAD_LIB}" = "error"; then
+    AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
+  fi
+  if test "${THREAD_LIB}" = "error"; then
+    AC_CHECK_LIB(pthreads,main,THREAD_LIB="-lpthreads")
+  fi
+  if test "${THREAD_LIB}" = "error"; then
+    AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r")
+  fi
+  if test "${THREAD_LIB}" = "error"; then
+    AC_CHECK_FUNCS(pthread_mutex_lock)
+    THREAD_LIB=""
+  fi
 
-VLC_ADD_LIBS([libvlccore libvlc vlc plugin],[${THREAD_LIB}])
+  VLC_ADD_LIBS([libvlccore libvlc vlc plugin],[${THREAD_LIB}])
 
-AC_CHECK_LIB(rt, clock_nanosleep, [
-  VLC_ADD_LIBS([libvlccore],[-lrt])
-  AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define to 1 if you have clock_nanosleep.])
-], [
-  dnl HP/UX port
-  AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlccore],[-lrt])])
-])
+  AC_CHECK_LIB(rt, clock_nanosleep, [
+    VLC_ADD_LIBS([libvlccore],[-lrt])
+    AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define to 1 if you have clock_nanosleep.])
+  ], [
+    dnl HP/UX port
+    AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlccore],[-lrt])])
+  ])
 
-have_nanosleep=false
-AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
-  AC_CHECK_LIB(rt,nanosleep,
-    [VLC_ADD_LIBS([libvlccore],[-lrt]) have_nanosleep=:],
-    [AC_CHECK_LIB(posix4,nanosleep,
-        [VLC_ADD_LIBS([libvlccore],[-lposix4]) have_nanosleep=:])]
-  )
-])
-if ${have_nanosleep}; then
-  AC_DEFINE(HAVE_NANOSLEEP, 1, [Define if nanosleep is available.])
-fi
+  have_nanosleep=false
+  AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
+    AC_CHECK_LIB(rt,nanosleep,
+      [VLC_ADD_LIBS([libvlccore],[-lrt]) have_nanosleep=:],
+      [AC_CHECK_LIB(posix4,nanosleep,
+          [VLC_ADD_LIBS([libvlccore],[-lposix4]) have_nanosleep=:])]
+    )
+  ])
+  if ${have_nanosleep}; then
+    AC_DEFINE(HAVE_NANOSLEEP, 1, [Define if nanosleep is available.])
+  fi
 fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
 
 dnl Check for misc headers
@@ -811,13 +803,14 @@ AC_CHECK_HEADERS([sys/mount.h], [], [],
   [
     #include <sys/param.h>
   ])
+
 if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
-AC_CHECK_HEADERS(machine/param.h sys/shm.h)
-AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h])
-AC_CHECK_HEADERS(syslog.h)
+  AC_CHECK_HEADERS(machine/param.h sys/shm.h)
+  AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h])
+  AC_CHECK_HEADERS(syslog.h)
 fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
 
-dnl LP64 adn LLP64 architectures had better define ssize_t by themselves...
+dnl LP64 and LLP64 architectures had better define ssize_t by themselves...
 AH_TEMPLATE(ssize_t, [Define to `int' if <stddef.h> does not define.])
 AC_CHECK_TYPE(ssize_t,, [
   AC_DEFINE(ssize_t, int)
@@ -833,14 +826,14 @@ fi
 
 dnl Mac OS X and other OSes don't have declaration for nanosleep
 if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
-AC_MSG_CHECKING(for nanosleep in time.h)
-AC_EGREP_HEADER(nanosleep,time.h,[
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_DECL_NANOSLEEP, 1,
-            Define if <time.h> defines nanosleep.)
-],[
-  AC_MSG_RESULT(no)
-])
+  AC_MSG_CHECKING(for nanosleep in time.h)
+  AC_EGREP_HEADER(nanosleep,time.h,[
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(HAVE_DECL_NANOSLEEP, 1,
+              Define if <time.h> defines nanosleep.)
+  ],[
+    AC_MSG_RESULT(no)
+  ])
 fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
 
 dnl Make sure we have timespecs
@@ -855,7 +848,7 @@ AC_EGREP_HEADER(timespec,sys/time.h,[
 
 dnl Check for threads library
 if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
-AC_CHECK_HEADERS(pthread.h)
+  AC_CHECK_HEADERS(pthread.h)
 fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
 
 dnl It seems that autoconf detects pkg-config only during the first
@@ -863,20 +856,20 @@ dnl PKG_CHECK_MODULES from configure.ac - which makes sense. But in our case,
 dnl it is nested within a conditional block, so it was not working right.
 dnl Make PKG_CONFIG_PATH precious so that it appears in the help and get saved
 AC_ARG_VAR(PKG_CONFIG_PATH,
-          [Paths where to find .pc not at the default location])
+       [Paths where to find .pc not at the default location])
 PKG_PROG_PKG_CONFIG()
 
 dnl On some OS we need static linking 
-       AS_IF([test -n "${PKG_CONFIG}" ],[
-             AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "darwin" ],[
-                 PKG_CONFIG="${PKG_CONFIG} --static"
-             ])
-       ])
+AS_IF([test -n "${PKG_CONFIG}" ],[
+    AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "darwin" ],[
+        PKG_CONFIG="${PKG_CONFIG} --static"
+    ])
+])
 
 
 dnl
 dnl Check for zlib.h and -lz along with system -lminizip if available
-dnl 
+dnl
 AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ])
 AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ])
 if test "${have_zlib}" = "yes"
@@ -1741,47 +1734,53 @@ if test "${enable_live555}" != "no"; then
     CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
 
     AC_CHECK_HEADERS(liveMedia_version.hh, [
-      AC_MSG_CHECKING(for liveMedia version >= 1214895600 )
+      AC_MSG_CHECKING(for liveMedia version >= 1275091200 )
       AC_EGREP_CPP(yes,
         [#include <liveMedia_version.hh>
          #ifdef LIVEMEDIA_LIBRARY_VERSION_INT
-         #if LIVEMEDIA_LIBRARY_VERSION_INT < 1214895600
+         #if LIVEMEDIA_LIBRARY_VERSION_INT < 1275091200
          yes
          #endif
          #endif],
         [AC_MSG_RESULT([no])
-         AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.
+          if test "${enable_live555}" == "yes"; then
+            AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.
 lternatively you can use --disable-live555 to disable the liveMedia plugin.])
-      ],[
-        AC_MSG_RESULT([yes])
-        ])
-    ])
-     other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
-     other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
-      if test "${SYS}" = "mingw32"; then
-        # add ws2_32 for closesocket, select, recv
-        other_libs="$other_libs -lws2_32"
-      elif test "${SYS}" = "mingwce"; then
-        # add ws2 for closesocket, select, recv
-        other_libs="$other_libs -lws2"
-      fi
-    dnl We need to check for pic because live555 don't provide shared libs
-    dnl and we want to build a plugins so we need -fPIC on some arch.
-    AC_CHECK_HEADERS(liveMedia.hh, [
-      VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
-        AC_CHECK_LIB(liveMedia_pic, main, [
-          VLC_ADD_PLUGIN([live555])
-         VLC_ADD_LIBS([live555], [-lliveMedia_pic ${other_libs_pic}])
-        ],[
-        AC_CHECK_LIB(liveMedia, main, [
-          VLC_ADD_PLUGIN([live555])
-          VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}])
-        ],[],[${other_libs}]) ],[${other_libs_pic}])
-    ],[
-       AC_MSG_WARN([The development files for liveMedia (live555) can't be found])
-    ])
-    CPPFLAGS="${CPPFLAGS_save}"
-    AC_LANG_POP(C++)
+          else
+            AC_MSG_WARN([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.])
+          fi
+        ],[
+          AC_MSG_RESULT([yes])
+          other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
+          other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
+          if test "${SYS}" = "mingw32"; then
+            # add ws2_32 for closesocket, select, recv
+            other_libs="$other_libs -lws2_32"
+          elif test "${SYS}" = "mingwce"; then
+            # add ws2 for closesocket, select, recv
+            other_libs="$other_libs -lws2"
+          fi
+
+          dnl We need to check for pic because live555 don't provide shared libs
+          dnl and we want to build a plugins so we need -fPIC on some arch.
+          AC_CHECK_HEADERS(liveMedia.hh, [
+            VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
+              AC_CHECK_LIB(liveMedia_pic, main, [
+                VLC_ADD_PLUGIN([live555])
+               VLC_ADD_LIBS([live555], [-lliveMedia_pic ${other_libs_pic}])
+              ],[
+                AC_CHECK_LIB(liveMedia, main, [
+                VLC_ADD_PLUGIN([live555])
+                VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}])
+              ],[],[${other_libs}]) ],[${other_libs_pic}])
+          ],[
+           AC_MSG_WARN([The development files for liveMedia (live555) can't be found])
+          ])
+
+          CPPFLAGS="${CPPFLAGS_save}"
+          AC_LANG_POP(C++)
+        ])
+      ])
   else
     AC_MSG_CHECKING(for liveMedia/libliveMedia.a in ${with_live555_tree})
     real_live555_tree="`cd ${with_live555_tree} 2>/dev/null && pwd`"
@@ -1794,11 +1793,11 @@ lternatively you can use --disable-live555 to disable the liveMedia plugin.])
       AC_MSG_RESULT(${real_live555_tree}/liveMedia/libliveMedia.a)
 
       AC_CHECK_HEADERS(${real_live555_tree}/liveMedia/include/liveMedia_version.hh,[
-        AC_MSG_CHECKING(for liveMedia version >= 1214895600 )
+        AC_MSG_CHECKING(for liveMedia version >= 1275091200 )
         AC_EGREP_CPP(yes,
           [#include "${real_live555_tree}/liveMedia/include/liveMedia_version.hh"
            #ifdef LIVEMEDIA_LIBRARY_VERSION_INT
-           #if LIVEMEDIA_LIBRARY_VERSION_INT < 1214895600
+           #if LIVEMEDIA_LIBRARY_VERSION_INT < 1275091200
            yes
            #endif
            #endif],
@@ -1921,6 +1920,11 @@ then
 fi
 
 
+dnl
+dnl  Blu-ray Disc Support with libbluray
+dnl
+PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray], (libbluray for Blu-ray disc support ) )
+
 dnl
 dnl  OpenCV wrapper and example filters
 dnl
@@ -2302,21 +2306,21 @@ AC_ARG_ENABLE(mkv,
 if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then
   AC_LANG_PUSH(C++)
   AC_CHECK_HEADERS(ebml/EbmlVersion.h, [
-    AC_MSG_CHECKING(for libebml version >= 0.7.7)
+    AC_MSG_CHECKING(for libebml version >= 1.0.0)
     AC_EGREP_CPP(yes,
       [#include <ebml/EbmlVersion.h>
        #ifdef LIBEBML_VERSION
-       #if LIBEBML_VERSION >= 0x000706
+       #if LIBEBML_VERSION >= 0x010000
        yes
        #endif
        #endif],
       [AC_MSG_RESULT([yes])
         AC_CHECK_HEADERS(matroska/KaxVersion.h, [
-          AC_MSG_CHECKING(for libmatroska version >= 0.8.0)
+          AC_MSG_CHECKING(for libmatroska version >= 1.0.0)
           AC_EGREP_CPP(yes,
             [#include <matroska/KaxVersion.h>
              #ifdef LIBMATROSKA_VERSION
-             #if LIBMATROSKA_VERSION >= 0x000705
+             #if LIBMATROSKA_VERSION >= 0x010000
              yes
              #endif
              #endif],
@@ -2334,7 +2338,7 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then
                   VLC_ADD_PLUGIN([mkv])
                   VLC_ADD_LIBS([mkv],[-lmatroska -lebml])
                 ])
-             )
+      )
             ],
             [AC_MSG_RESULT([no])
               AC_MSG_ERROR([Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin.])
@@ -2520,6 +2524,13 @@ AC_ARG_ENABLE(merge-ffmpeg,
 ])
 AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"])
 
+AC_CACHE_CHECK([if linker supports -Bsymbolic],
+  [ac_cv_ld_bsymbolic],
+  [LDFLAGS="${LDFLAGS_vlc} -Wl,-Bsymbolic"
+    AC_TRY_LINK([],,ac_cv_ld_bsymbolic=yes,ac_cv_ld_bsymbolic=no)
+    LDFLAGS="${LDFLAGS_save}"
+  ])
+
 dnl
 dnl  avcodec decoder/encoder plugin
 dnl
@@ -2535,6 +2546,9 @@ AS_IF([test "${enable_avcodec}" != "no"], [
       AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
       VLC_ADD_PLUGIN([avcodec])
       VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS])
+      AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [
+        VLC_ADD_LDFLAGS([avcodec],[-Wl,-Bsymbolic])
+      ])
       VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS])
       VLC_RESTORE_FLAGS
       have_avcodec="yes"
@@ -2651,6 +2665,9 @@ then
         VLC_ADD_PLUGIN([avformat access_avio])
         VLC_ADD_LIBS([avformat access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS])
         VLC_ADD_CFLAGS([avformat access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
+        AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [
+          VLC_ADD_LDFLAGS([avformat access_avio],[-Wl,-Bsymbolic])
+        ])
       ], [
         VLC_ADD_LIBS([avcodec],[$AVFORMAT_LIBS $AVUTIL_LIBS])
         VLC_ADD_CFLAGS([avcodec],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
@@ -2679,6 +2696,9 @@ then
       VLC_ADD_PLUGIN([swscale])
       VLC_ADD_LIBS([swscale],[$SWSCALE_LIBS])
       VLC_ADD_CFLAGS([swscale],[$SWSCALE_CFLAGS])
+      AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [
+        VLC_ADD_LDFLAGS([swscale],[-Wl,-Bsymbolic])
+      ])
       VLC_RESTORE_FLAGS
     ],[
       AC_MSG_ERROR([Could not find libswscale. Use --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.])
@@ -2998,12 +3018,6 @@ if test "${enable_x264}" != "no"; then
         VLC_ADD_PLUGIN([x264])
         VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
 
-        AC_CACHE_CHECK([if linker supports -Bsymbolic],
-          [ac_cv_ld_bsymbolic],
-          [LDFLAGS="${LDFLAGS_vlc} -Wl,-Bsymbolic"
-            AC_TRY_LINK([],,ac_cv_ld_bsymbolic=yes,ac_cv_ld_bsymbolic=no)
-            LDFLAGS="${LDFLAGS_save}"
-          ])
         AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [
           VLC_ADD_LDFLAGS([x264],[-Wl,-Bsymbolic])
         ])
@@ -3083,26 +3097,6 @@ AS_IF( [test "${enable_libass}" != "no"], [
       ])
   ])
 
-dnl
-dnl asa demuxer
-dnl
-AC_ARG_ENABLE(asademux,
-  [  --enable-asademux       asa subtitle demuxing (default disabled)])
-AS_IF( [test "${enable_asademux}" = "yes"], [
-  PKG_CHECK_MODULES(PCRE,
-      libpcre >= 6.5,
-      [
-        VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS])
-        VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS])
-        if test "${SYS}" = "mingw32"; then
-            VLC_ADD_CPPFLAGS([asademux],[-DPCRE_STATIC])
-        fi
-        VLC_ADD_PLUGIN([asademux])
-      ],[
-        AC_MSG_WARN([PCRE library not found (required for asademux)])
-      ])
-  ])
-
 dnl
 dnl  kate decoder plugin
 dnl
@@ -3202,7 +3196,9 @@ AS_IF([test "${enable_xcb}" != "no"], [
     VLC_ADD_PLUGIN([panoramix])
     VLC_ADD_LIBS([panoramix],[${XCB_RANDR_LIBS} ${XCB_LIBS}])
     VLC_ADD_CFLAGS([panoramix],[${XCB_RANDR_CFLAGS} ${XCB_CFLAGS}])
-  ], [true])
+  ], [
+    AC_MSG_WARN([libxcb-randr not found. Panoramix filter will not be supported.])
+  ])
 
   dnl xcb-utils
   PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [
@@ -3608,6 +3604,17 @@ then
     ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
 fi
 
+dnl
+dnl  AudioQueue plugin
+dnl
+AC_ARG_ENABLE(audioqueue,
+  [  --enable-audioqueue       AudioQueue audio module (default disabled)])
+if test "${enable_audioqueue}" = "yes"
+then
+  VLC_ADD_PLUGIN([audioqueue])
+  VLC_ADD_LDFLAGS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation])
+fi
+
 dnl
 dnl  Roku HD1000 audio
 dnl
@@ -3681,7 +3688,7 @@ if test "${enable_skins2}" = "yes" ||
     ALIASES="${ALIASES} svlc"
     VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} -DX11_SKINS])
     VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
-    VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11])
+    VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lXpm -lX11])
     need_xid_provider="no"
   fi fi fi
 fi
@@ -4587,7 +4594,6 @@ AC_CONFIG_FILES([
   modules/codec/dmo/Makefile
   modules/codec/omxil/Makefile
   modules/codec/shine/Makefile
-  modules/codec/subtitles/Makefile
   modules/codec/spudec/Makefile
   modules/codec/wmafixed/Makefile
   modules/control/Makefile