X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=6efa99b3188f67a6a167a59e3b8b0ab5d31db67e;hb=52943ce6dcaa19e2924846d2225176375f49b2c8;hp=526bf4db490ebf6045fc22af777273e43f4edf43;hpb=6d6fcaba2c7b55b9817ec0ee8b0dc9239ea3895d;p=vlc

diff --git a/configure.ac b/configure.ac
index 526bf4db49..6efa99b318 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,7 +279,7 @@ case "${host_os}" in
         LD="${LD} -syslibroot ${with_macosx_sdk}"
     fi
     AC_ARG_WITH(macosx-version-min,
-       [  --with-macosx-version-min=VERSION  compile for MacOSX VERSION and above])
+       [  --with-macosx-version-min=VERSION compile for MacOSX VERSION and above])
     if test "${with_macosx_version_min}" != "" ; then
         CPP="${CPP} -mmacosx-version-min=${with_macosx_version_min}"
         CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
@@ -353,7 +353,7 @@ case "${host_os}" in
         dnl DEP and ASLR options
         dnl
         AC_ARG_ENABLE(peflags,
-          [  --enable-peflags          peflags use (default enabled)])
+          [  --enable-peflags        peflags use (default enabled on Windows)])
         if test "${enable_peflags}" != "no"
         then
           AC_CHECK_TOOL(PEFLAGS, peflags, :)
@@ -1396,8 +1396,8 @@ dnl  Check for fully workin SSE2 intrinsics
 dnl  We need support for -mmmx, we need <emmintrin.h>, and we also need a
 dnl  working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963)
 AC_ARG_ENABLE(sse,
-[  --disable-sse           disable SSE (1, 2, 3 and 4) optimizations (default auto)]
-,, [
+[  --disable-sse           disable SSE (1, 2, 3 and 4) optimizations (default auto)],
+, [
   case "${host_cpu}" in
     i686|x86_64)
       enable_sse=yes
@@ -1519,7 +1519,7 @@ AS_IF([test "${ac_cv_3dnow_inline}" != "no"], [
 
 
 AC_ARG_ENABLE(neon,
-[ --disable-neon           disable NEON optimizations (default auto)],, [
+[  --disable-neon          disable NEON optimizations (default auto)],, [
   AS_IF([test "${host_cpu}" = "arm"], [enable_neon="yes"] ,[enable_neon="no"])
 ])
 AS_IF([test "${enable_neon}" != "no"], [
@@ -1908,7 +1908,7 @@ AC_ARG_ENABLE(live555,
 [  --enable-live555        live555 RTSP input plugin (default enabled)])
 if test "${enable_live555}" != "no"; then
   AC_ARG_WITH(live555-tree,
-    [    --with-live555-tree=PATH live.com tree for static linking])
+    [  --with-live555-tree=PATH live.com tree for static linking])
 
   dnl
   dnl test for --with-live555-tree
@@ -2042,9 +2042,9 @@ AC_ARG_ENABLE(dvdread,
 if test "${enable_dvdread}" != "no"
 then
   AC_ARG_WITH(dvdread,
-  [    --with-dvdread=PATH   libdvdread headers and libraries])
+  [  --with-dvdread=PATH     libdvdread headers and libraries])
   AC_ARG_WITH(dvdread-tree,
-  [    --with-dvdread-tree=PATH libdvdread tree for static linking])
+  [  --with-dvdread-tree=PATH libdvdread tree for static linking])
 
   dnl Temporary hack (yeah, sure ;)
   if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin" || test "${SYS}" = "beos" ; then
@@ -2122,7 +2122,7 @@ then
 
   DVDNAV_PATH="${PATH}"
   AC_ARG_WITH(dvdnav-config-path,
-    [    --with-dvdnav-config-path=PATH dvdnav-config path (default search in \$PATH)],
+    [  --with-dvdnav-config-path=PATH dvdnav-config path (default search in \$PATH)],
     [ if test "${with_dvdnav_config_path}" != "no"
       then
         DVDNAV_PATH="${with_dvdnav_config_path}:${PATH}"
@@ -2180,7 +2180,7 @@ AC_ARG_ENABLE(opencv,
 if test "${enable_opencv}" = "yes" -a "${CXX}" != "";
 then
   AC_ARG_WITH(opencv-tree,
-  [    --with-opencv-tree=PATH opencv tree for linking])
+  [  --with-opencv-tree=PATH opencv tree for linking])
     if test "${SYS}" = "mingw32"
     then
       test -z "${with_opencv_tree}" && AC_MSG_ERROR([You have to specify --with-opencv-tree])
@@ -2253,9 +2253,9 @@ have_dvbpsi=no
 if test "${enable_dvbpsi}" != "no"
 then
   AC_ARG_WITH(dvbpsi,
-  [    --with-dvbpsi=PATH    libdvbpsi headers and libraries])
+  [  --with-dvbpsi=PATH      libdvbpsi headers and libraries])
   AC_ARG_WITH(dvbpsi,
-  [    --with-dvbpsi-tree=PATH libdvbpsi tree for static linking])
+  [  --with-dvbpsi-tree=PATH libdvbpsi tree for static linking])
   case "${with_dvbpsi}" in
   ""|yes)
     if test -z "${with_dvbpsi_tree}"
@@ -2321,7 +2321,8 @@ then
     AC_CHECK_HEADERS([dvbpsi/dr.h],[
       VLC_ADD_PLUGIN([ts])
       if test "${enable_sout}" != "no"; then
-        VLC_ADD_PLUGIN([mux_ts])
+        AC_CHECK_LIB(dvbpsi, dvbpsi_SDTServiceAddDescriptor,
+           [VLC_ADD_PLUGIN([mux_ts])], [], [${LDFLAGS_test} -ldvbpsi])
       fi
       VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}])
       VLC_ADD_LIBS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi])
@@ -2329,7 +2330,7 @@ then
     ],[
       if test -n "${enable_dvbpsi}"
       then
-        AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1])
+        AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.6])
       fi
     ],
     [#if defined( HAVE_STDINT_H )
@@ -2358,7 +2359,7 @@ AC_ARG_ENABLE(v4l,
 if test "${enable_v4l}" = "yes"
 then
   AC_ARG_WITH(v4l,
-    [    --with-v4l=PATH       path to a v4l-enabled kernel tree],[],[])
+    [  --with-v4l=PATH         path to a v4l-enabled kernel tree],[],[])
   if test "${with_v4l}" != "no" -a -n "${with_v4l}"
   then
     VLC_ADD_CPPFLAGS([v4l],[-I${with_v4l}/include])
@@ -2375,7 +2376,7 @@ dnl
 dnl libv4l1 support for video4linux.
 dnl
 AC_ARG_ENABLE( libv4l,
-  [  --enable-libv4l        Libv4l Video4Linux support (default enabled)])
+  [  --enable-libv4l         Libv4l Video4Linux support (default enabled)])
 if test "${enable_libv4l}" != "no" -a "${enable_v4l}" != "no"
 then
     PKG_CHECK_MODULES( LIBV4L, libv4l1, [
@@ -2394,7 +2395,7 @@ AC_ARG_ENABLE(v4l2,
 if test "${enable_v4l2}" != "no"
 then
   AC_ARG_WITH(v4l2,
-    [    --with-v4l2=PATH       path to a v4l2-enabled kernel tree],[],[])
+    [  --with-v4l2=PATH        path to a v4l2-enabled kernel tree],[],[])
   if test "${with_v4l2}" != "no" -a -n "${with_v4l2}"
   then
     VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include])
@@ -2465,8 +2466,8 @@ dnl Need to test libcdio and libvcdinfo for a number of things. Do it now.
 AC_ARG_ENABLE(libcdio,
   [  --enable-libcdio        CD input and control library support (default enabled)])
 
-AC_ARG_ENABLE(vcdinfo,
-  [  --enable-vcdinfo        VCD information library support (default enabled)])
+AC_ARG_ENABLE(libvcdinfo,
+  [  --enable-libvcdinfo     VCD information library support (default enabled)])
 
 have_libcdio=no
 have_libvcdinfo=no
@@ -2480,7 +2481,7 @@ then
 
   if test "${enable_vcdinfo}" != "no"
   then
-    PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.22,
+    PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22,
        [have_libvcdinfo=yes],
        [AC_MSG_WARN(VCD information library not found)])
   fi
@@ -2601,7 +2602,7 @@ if test "${enable_dvb}" != "no"
 then
     AS_IF([test "${have_dvbpsi}" = "yes" ],[
     AC_ARG_WITH(dvb,
-     [    --with-dvb=PATH       path to a dvb- and v4l2-enabled kernel tree],[],[])
+     [  --with-dvb=PATH         path to a dvb- and v4l2-enabled kernel tree],[],[])
      if test "${with_dvb}" != "no" -a -n "${with_dvb}"
      then
        VLC_ADD_CFLAGS([dvb],[-I${with_dvb}/include])
@@ -2732,7 +2733,7 @@ AC_ARG_ENABLE(mod,
 if test "${enable_mod}" != "no"
 then
   AC_ARG_WITH(mod-tree,
-  [    --with-mod-tree=PATH mod tree for static linking])
+  [  --with-mod-tree=PATH    mod tree for static linking])
   if test -n "${with_mod_tree}"
   then
     AC_MSG_CHECKING(for libmodplug.a in ${with_mod_tree})
@@ -2756,10 +2757,11 @@ then
       AC_MSG_ERROR([cannot find ${real_mod_tree}/src/.libs/libmodplug.a, make sure you compiled mod in ${with_mod_tree}])
     fi
   else
-    AC_CHECK_HEADERS(libmodplug/modplug.h, [
-      VLC_ADD_PLUGIN([mod])
-      VLC_ADD_CXXFLAGS([mod],[])
-      VLC_ADD_LIBS([mod],[-lmodplug -lstdc++])])
+    PKG_CHECK_MODULES(LIBMODPLUG, libmodplug >= 0.8,
+        [ VLC_ADD_PLUGIN([mod])
+          VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
+          VLC_ADD_LIBS([mod],[$LIBMODPLUG_LIBS])
+        ],[AC_MSG_WARN([libmodplug not found!])])
   fi
 fi
 
@@ -2787,7 +2789,7 @@ if test "${enable_gme}" != "no" -a "${CXX}" != "";
 then
   AC_LANG_PUSH(C++)
   AC_ARG_WITH(gme-tree,
-  [    --with-gme-tree=PATH gme tree for static linking])
+  [  --with-gme-tree=PATH    gme tree for static linking])
   if test -n "${with_gme_tree}"
   then
     AC_MSG_CHECKING(for libgme.a in ${with_mod_tree})
@@ -2850,7 +2852,7 @@ AC_ARG_ENABLE(mad,
 if test "${enable_mad}" != "no"
 then
   AC_ARG_WITH(mad,
-    [    --with-mad=PATH       path to libmad],[],[])
+    [  --with-mad=PATH         path to libmad],[],[])
   if test "${with_mad}" != "no" -a -n "${with_mad}"
   then
     VLC_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include])
@@ -2858,7 +2860,7 @@ then
   fi
 
   AC_ARG_WITH(mad-tree,
-    [    --with-mad-tree=PATH   mad tree for static linking],[],[])
+    [  --with-mad-tree=PATH    mad tree for static linking],[],[])
   if test "${with_mad_tree}" != "no" -a -n "${with_mad_tree}"
   then
     real_mad_tree="`cd ${with_mad_tree} 2>/dev/null && pwd`"
@@ -2915,7 +2917,7 @@ AS_IF([test "${enable_id3tag}" = "yes"], [
 ])
 
 AC_ARG_ENABLE(merge-ffmpeg,
-[  --enable-merge-ffmpeg  merge FFmpeg-based plugins (default disabled)],, [
+[  --enable-merge-ffmpeg   merge FFmpeg-based plugins (default disabled)],, [
   enable_merge_ffmpeg="no"
 ])
 AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"])
@@ -2954,22 +2956,68 @@ dnl
 dnl libva needs avcodec
 dnl
 AC_ARG_ENABLE(libva,
-  [  --enable-libva         libva VAAPI support (default disabled)])
-AS_IF([test "${enable_libva}" = "yes"], [
+  [  --enable-libva          libva VAAPI support (default auto)])
+
+AS_IF([test "${enable_libva}" != "no"], [
   AS_IF([test "x${have_avcodec}" = "xyes"], [
     PKG_CHECK_MODULES(LIBVA, [libva libva-x11],
       [
-        VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS])
-        VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS])
-        AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
+        AC_CHECK_HEADERS(libavcodec/vaapi.h, [
+           VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS])
+           VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS])
+           AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
+           echo "VAAPI acceleration activated"
+        ],[
+	AS_IF([test "${enable_libva}" == "yes"],
+	      [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])],
+              [AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])])
+        ])
       ],[
-        AC_MSG_ERROR([Could not find libva.])
+	AS_IF([test "${enable_libva}" == "yes"],
+              [AC_MSG_ERROR([Could not find required libva.])],
+              [AC_MSG_WARN([libva not found  ])])
+      ])
+  ],[
+    AS_IF([test "x${enable_libva}" != "x"], [
+      AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive.])
     ])
+  ])
+])
+
+dnl
+dnl dxva2 needs avcodec
+dnl
+AC_ARG_ENABLE(dxva2,
+  [  --enable-dxva2          DxVA2  support (default auto)])
+
+AS_IF([test "${enable_dxva2}" != "no"], [
+  if test "${SYS}" = "mingw32"; then
+  AS_IF([test "x${have_avcodec}" = "xyes"], [
+    AC_CHECK_HEADERS(dxva2api.h, 
+      [
+        AC_CHECK_HEADERS(libavcodec/dxva2.h, [
+           VLC_ADD_LIBS([avcodec],[-lole32 -lshlwapi -luuid])
+           AC_DEFINE(HAVE_AVCODEC_DXVA2, 1, [Define if avcodec has to be built with DxVA2 support.])
+           echo "DxVA2 acceleration activated"
+        ],[
+	AS_IF([test "${enable_dxva2}" == "yes"],
+	      [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])],
+              [AC_MSG_WARN([dxva2 is present but libavcodec/dxva2.h is missing ])])
+        ])
+      ],[
+	AS_IF([test "${enable_dxva2}" == "yes"],
+              [AC_MSG_ERROR([Could not find required dxva2api.h])],
+              [AC_MSG_WARN([dxva2api.h not found])])
+      ])
   ],[
-    AC_MSG_ERROR([libva VAAPI support depends on libavcodec.])
+    AS_IF([test "x${enable_dxva2}" != "x"], [
+      AC_MSG_ERROR([--enable-dxva2 and --disable-avcodec options are mutually exclusive.])
+    ])
   ])
+  fi
 ])
 
+
 dnl
 dnl stream_out switcher needs libavcodec
 dnl
@@ -3073,7 +3121,7 @@ AC_ARG_ENABLE(faad,
 if test "${enable_faad}" = "yes"
 then
   AC_ARG_WITH(faad-tree,
-  [    --with-faad-tree=PATH faad tree for static linking])
+  [  --with-faad-tree=PATH   faad tree for static linking])
   if test -n "${with_faad_tree}"
   then
     AC_MSG_CHECKING(for libfaad.a in ${with_faad_tree})
@@ -3182,9 +3230,9 @@ AC_ARG_ENABLE(a52,
 if test "${enable_a52}" != "no"
 then
   AC_ARG_WITH(a52,
-    [    --with-a52=PATH       a52 headers and libraries])
+    [  --with-a52=PATH         a52 headers and libraries])
   AC_ARG_WITH(a52-tree,
-    [    --with-a52-tree=PATH  a52dec tree for static linking ],[],[])
+    [  --with-a52-tree=PATH    a52dec tree for static linking ],[],[])
   if test "${with_a52_tree}" != "no" -a -n "${with_a52_tree}"
   then
     real_a52_tree="`cd ${with_a52_tree} 2>/dev/null && pwd`"
@@ -3247,7 +3295,7 @@ then
 fi
 
 AC_ARG_WITH(a52-fixed,
-      [    --with-a52-fixed      specify if liba52 has been compiled with fixed point support],
+      [  --with-a52-fixed        specify if liba52 has been compiled with fixed point support],
       [
         VLC_ADD_CPPFLAGS([a52tofloat32],[-DLIBA52_FIXED]) ])
 
@@ -3292,34 +3340,6 @@ dnl  Speex plugin
 dnl
 PKG_ENABLE_MODULES_VLC([SPEEX], [], [ogg speex >= 1.0.5], [Speex decoder support], [auto])
 
-dnl
-dnl  tarkin decoder plugin
-dnl
-AC_ARG_ENABLE(tarkin,
-[  --enable-tarkin         experimental tarkin codec (default disabled)])
-if test "${enable_tarkin}" = "yes"
-then
-  AC_ARG_WITH(tarkin-tree,
-  [    --with-tarkin-tree=PATH tarkin tree for static linking])
-  if test -n "${with_tarkin_tree}"
-  then
-    AC_MSG_CHECKING(for tarkin.o in ${with_tarkin_tree})
-    real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`"
-    if test -f "${real_tarkin_tree}/tarkin.o"
-    then
-      VLC_ADD_PLUGIN([tarkin])
-      VLC_ADD_CPPFLAGS([tarkin],[-I${real_tarkin_tree}])
-      VLC_ADD_LIBS([tarkin],[${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg])
-      AC_MSG_RESULT(yes)
-    else
-      dnl  The given tarkin tree wasn't built
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR([cannot find ${real_tarkin_tree}/tarkin.o,
-                    make sure you compiled tarkin in ${with_tarkin_tree}])
-    fi
-  fi
-fi
-
 dnl
 dnl  theora decoder plugin
 dnl
@@ -3361,7 +3381,7 @@ AC_ARG_ENABLE(x264,
   [  --enable-x264           H264 encoding support with libx264 (default enabled)])
 if test "${enable_x264}" != "no"; then
   AC_ARG_WITH(x264-tree,
-    [    --with-x264-tree=PATH x264 tree for static linking ],[],[])
+    [  --with-x264-tree=PATH   x264 tree for static linking ],[],[])
   if test "${with_x264_tree}" != "no" -a -n "${with_x264_tree}"
   then
     real_x264_tree="`cd ${with_x264_tree} 2>/dev/null && pwd`"
@@ -3441,7 +3461,7 @@ AC_ARG_ENABLE(telx,
 
 AS_IF( [test "${enable_zvbi}" != "no"],[
     PKG_CHECK_MODULES(ZVBI,
-        zvbi-0.2 >= 0.2.25,
+        zvbi-0.2 >= 0.2.28,
         [
           VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
           if test "${SYS}" = "mingw32"; then
@@ -3674,7 +3694,7 @@ if test "${enable_sdl}" != "no"
 then
   SDL_PATH="${PATH}"
   AC_ARG_WITH(sdl-config-path,
-    [    --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)],
+    [  --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)],
     [ if test "${with_sdl_config_path}" != "no"
       then
         SDL_PATH="${with_sdl_config_path}:${PATH}"
@@ -3725,7 +3745,7 @@ AC_ARG_ENABLE(freetype,
 AC_ARG_ENABLE(fribidi,
   [  --enable-fribidi        fribidi support (default enabled)])
 AC_ARG_ENABLE(fontconfig,
-  [  --enable-fontconfig,    fontconfig support (default enabled)])
+  [  --enable-fontconfig     fontconfig support (default enabled)])
 if test "${enable_freetype}" != "no"
 then
    PKG_CHECK_MODULES(FREETYPE, freetype2,[
@@ -3918,7 +3938,7 @@ dnl
 AC_ARG_ENABLE(directfb,
   [  --enable-directfb       DirectFB support (default disabled)])
 AC_ARG_WITH(directfb,
-  [    --with-directfb=PATH  path to DirectFB headers and libraries])
+  [  --with-directfb=PATH    path to DirectFB headers and libraries])
 
 if test "${enable_directfb}" = "yes"; then
     have_directfb="false"
@@ -3991,7 +4011,7 @@ then
     VLC_ADD_PLUGIN([ggi])
     VLC_ADD_LIBS([ggi],[-lggi])
     AC_ARG_WITH(ggi,
-      [    --with-ggi=PATH       path to libggi],
+      [  --with-ggi=PATH         path to libggi],
       [ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
         then
           VLC_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
@@ -4020,7 +4040,7 @@ fi
 dnl
 dnl  libcaca plugin
 dnl
-PKG_ENABLE_MODULES_VLC([CACA], [], [caca >= 0.99.beta1], [libcaca output],[auto])
+PKG_ENABLE_MODULES_VLC([CACA], [], [caca >= 0.99.beta14], [libcaca output],[auto])
 
 dnl
 dnl  Audio plugins
@@ -4121,7 +4141,7 @@ AC_ARG_ENABLE(cyberlink,
   [  --enable-cyberlink      CyberLink for C++ UPnP stack (default disabled)])
   AS_IF([test "${enable_cyberlink}" = "yes" ], [
   AC_ARG_WITH(cyberlink-tree,
-    [    --with-cyberlink-tree=PATH CyberLink for C++ tree for static linking])
+    [  --with-cyberlink-tree=PATH CyberLink for C++ tree for static linking])
 
   dnl
   dnl test for --with-cyberlink-tree
@@ -4277,7 +4297,7 @@ dnl
 dnl QT 4
 dnl
 AC_ARG_ENABLE(qt4,
-  [  --enable-qt4            QT 4 support (default enabled) ],, [
+  [  --enable-qt4            Qt 4 support (default enabled) ],, [
   AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no])
 ])
 AS_IF([test "${enable_qt4}" != "no"], [
@@ -4318,7 +4338,7 @@ dnl
 dnl  MacOS X video output/gui modules
 dnl
 AC_ARG_ENABLE(macosx,
-  [  --enable-macosx   Mac OS X gui support (default enabled on Mac OS X)])
+  [  --enable-macosx         Mac OS X gui support (default enabled on Mac OS X)])
 if test "x${enable_macosx}" = "xyes"
 then
   VLC_ADD_LDFLAGS([macosx minimal_macosx],[-Wl,-framework,Cocoa])
@@ -4343,7 +4363,7 @@ dnl  MacOS X related modules
 dnl
 
 AC_ARG_ENABLE(macosx-vout,
-  [  --enable-macosx-vout   Mac OS X video output module (default enabled on Mac OS X)])
+  [  --enable-macosx-vout    Mac OS X video output module (default enabled on Mac OS X)])
 if test "x${enable_macosx_vout}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_vout}" = "yes")
 then
@@ -4353,7 +4373,7 @@ then
 fi
 
 AC_ARG_ENABLE(macosx-dialog-provider,
-  [  --enable-macosx-dialog-provider   Mac OS X dialog module (default enabled on Mac OS X)])
+  [  --enable-macosx-dialog-provider Mac OS X dialog module (default enabled on Mac OS X)])
 if test "x${enable_macosx_dialog_provider}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_dialog_provider}" = "yes")
 then
@@ -4362,7 +4382,7 @@ then
 fi
 
 AC_ARG_ENABLE(macosx-qtcapture,
-  [  --enable-macosx-qtcapture   Mac OS X qtcapture (iSight) module (default enabled on Mac OS X)])
+  [  --enable-macosx-qtcapture Mac OS X qtcapture (iSight) module (default enabled on Mac OS X)])
 if test "x${enable_macosx_qtcapture}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_qtcapture}" = "yes")
 then
@@ -4384,7 +4404,7 @@ then
 fi
 
 AC_ARG_ENABLE(macosx-vlc-app,
-  [  --enable-macosx-vlc-app            build the VLC media player (default enabled on Mac OS X)])
+  [  --enable-macosx-vlc-app build the VLC media player (default enabled on Mac OS X)])
 AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" &&
     (test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ])
 
@@ -4531,7 +4551,7 @@ dnl
 dnl libgcrypt
 dnl
 AC_ARG_ENABLE(libgcrypt,
-  [  --disable-libgcrypt      gcrypt support (default enabled)])
+  [  --disable-libgcrypt     gcrypt support (default enabled)])
 AS_IF([test "${enable_libgcrypt}" != "no"], [
   AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [
     libgcrypt-config --version >/dev/null || \
@@ -4657,7 +4677,7 @@ dnl
 AC_ARG_WITH(sqlite,
   [  --with-sqlite=PATH      sqlite path linking])
 if test "${SYS}" != "darwin"; then
-  PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3], [sqlite3], [auto])
+  PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3 >= 3.6.0], [sqlite3], [auto])
 else
   if test "${enable_sqlite}" != "no"
   then
@@ -4733,7 +4753,7 @@ AC_ARG_ENABLE(activex,
   AS_HELP_STRING([--enable-activex],[build a vlc-based ActiveX control
 		  (default enabled on Win32)]))
 AC_ARG_WITH(wine-sdk-path,
-  [    --with-wine-sdk-path=PATH path to wine sdk])
+  [  --with-wine-sdk-path=PATH path to wine sdk])
 if test "${enable_activex}" != "no"
 then
   if test "${SYS}" = "mingw32"
@@ -4784,9 +4804,9 @@ AC_ARG_ENABLE(mozilla,
   AS_HELP_STRING([--enable-mozilla],[build a vlc-based Firefox/Mozilla plugin
 		  (default disabled)]))
 AC_ARG_WITH(mozilla-sdk-path,
-  [    --with-mozilla-sdk-path=PATH path to mozilla sdk])
+  [  --with-mozilla-sdk-path=PATH path to mozilla sdk])
 AC_ARG_WITH(mozilla-pkg,
-  [    --with-mozilla-pkg=PKG  look for PKG.pc to build the mozilla plugin.])
+  [  --with-mozilla-pkg=PKG  look for PKG.pc to build the mozilla plugin.])
 AC_LANG_PUSH(C++)
 if test "${enable_mozilla}" = "yes"
 then