X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=630e9305ca921ac08468a635acadf67f4fcf6d0c;hb=caf6188518644f20b84536fca5af932de98ecd02;hp=8295e8203149d1561963d6bbcc89a7c639716107;hpb=88a2f3ed297cc89eb4f13e1ec4c673c04fdf5f29;p=vlc

diff --git a/configure.ac b/configure.ac
index 8295e82031..630e9305ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_INIT(vlc, 0.9.0-test1)
+AC_INIT(vlc, 0.9.0-test2)
 VERSION_MAJOR="0"
 VERSION_MINOR="9"
 VERSION_REVISION="0"
@@ -57,7 +57,7 @@ dnl Check for tools
 dnl
 AC_PROG_CC_C99
 AC_USE_SYSTEM_EXTENSIONS
-AC_DEFINE([_FORTIFY_SOURCE], 2, [Define to `2' to get glibc warnings.])
+AC_DEFINE([_FORTIFY_SOURCE], 2, [Define to '2' to get glibc warnings.])
 AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_CPP
@@ -80,6 +80,17 @@ AC_C_CONST
 AC_C_INLINE
 AC_C_RESTRICT
 
+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_IF([test -n "${with_binary_version}"],[
+      AC_DEFINE_UNQUOTED([DISTRO_VERSION],["${with_binary_version}"],
+			 [Binary specific version])
+      ])
+
+
 dnl
 dnl  Check for the contrib directory
 dnl
@@ -131,12 +142,6 @@ AC_ARG_WITH(contrib,
     if test -z $with_cyberlink_tree; then
        with_cyberlink_tree=${topdir}/extras/contrib/src/clinkcc
     fi
-    if test -z $with_libmpeg2_tree; then
-       with_libmpeg2_tree=${topdir}/extras/contrib/src/mpeg2dec
-    fi
-    if test -z $with_a52_tree; then
-       with_a52_tree=${topdir}/extras/contrib/src/a52dec
-    fi
 
     if test ".`uname -s`" = ".Darwin"; then
       export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH
@@ -197,7 +202,8 @@ case "${host_os}" in
     VLC_ADD_LDFLAGS([libvlc],[-Wl,-framework,CoreFoundation])
     VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation])
     AC_ARG_ENABLE(macosx-defaults,
-        [  --enable-macosx-defaults Build the default configuration on Mac OS X (default enabled)])
+      AS_HELP_STRING([--enable-macosx-defaults],[Build the default configuration
+		     on Mac OS X (default enabled)]))
     if test "x${enable_macosx_defaults}" != "xno"
     then
         echo ""
@@ -419,8 +425,6 @@ dnl
 dnl Iconv stuff
 dnl
 AM_ICONV
-AS_IF([test "$am_cv_func_iconv" != "yes"],
-	[AC_MSG_ERROR([libiconv is needed for VLC to work properly])])
 VLC_ADD_CFLAGS([libvlc],[${INCICONV}])
 VLC_ADD_LIBS([libvlc],[${LTLIBICONV}])
 
@@ -792,7 +796,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
 
 dnl Check for headers
 AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h locale.h)
-AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h)
+AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h xlocale.h)
 AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h])
 AC_CHECK_HEADERS([net/if.h], [], [],
   [
@@ -894,7 +898,8 @@ then
           VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS])
         fi
       dnl Check for Telepathy
-        AC_ARG_ENABLE(telepathy, [  --enable-telepathy      Telepathy Presence plugin through DBus(default enabled)])
+        AC_ARG_ENABLE(telepathy,
+          AS_HELP_STRING([--enable-telepathy],[Telepathy Presence plugin through DBus(default enabled)]))
         if test "${enable_telepathy}" != "no"; then
           VLC_ADD_PLUGIN([telepathy])
           VLC_ADD_LIBS([telepathy],[$DBUS_LIBS])
@@ -1204,7 +1209,7 @@ if test "${SYS}" != "mingwce"; then
   VLC_ADD_PLUGIN([i422_i420])
   VLC_ADD_PLUGIN([yuy2_i422])
   VLC_ADD_PLUGIN([yuy2_i420])
-  VLC_ADD_PLUGIN([chroma_chain])
+  VLC_ADD_PLUGIN([chain])
   VLC_ADD_PLUGIN([aout_file])
   VLC_ADD_PLUGIN([linear_resampler])
   VLC_ADD_PLUGIN([bandlimited_resampler])
@@ -1216,6 +1221,7 @@ if test "${SYS}" != "mingwce"; then
   VLC_ADD_PLUGIN([normvol])
   VLC_ADD_PLUGIN([equalizer])
   VLC_ADD_PLUGIN([param_eq])
+  VLC_ADD_PLUGIN([scaletempo])
   VLC_ADD_PLUGIN([converter_float])
   VLC_ADD_PLUGIN([a52tospdif])
   VLC_ADD_PLUGIN([dtstospdif])
@@ -1619,7 +1625,8 @@ fi
 
 dnl Lua modules
 AC_ARG_ENABLE(lua,
-  [  --enable-lua            lua playlist, metafetcher and interface plugins (default enabled)])
+  AS_HELP_STRING([--enable-lua],[lua playlist, metafetcher and interface 
+		  plugins (default enabled)]))
 if test "${enable_lua}" != "no"
 then
   PKG_CHECK_MODULES(LUA, lua5.1,
@@ -1694,6 +1701,7 @@ AS_IF([test "${enable_vlm}" != "no"], [
   AC_DEFINE(ENABLE_VLM, 1, [Define if you want the VideoLAN manager support])
   VLC_ADD_PLUGIN([telnet])
 ])
+AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"])
 
 dnl
 dnl Growl notification plugin
@@ -2045,11 +2053,16 @@ then
         [ VLC_ADD_PLUGIN([dvdread])
           VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}])
         ],[
-          if test -n "${enable_dvdread}"
-          then
-            AC_MSG_ERROR([cannot find libdvdread headers])
-          fi
-        ])
+	  AC_CHECK_HEADERS(libdvdread/dvd_reader.h,
+            [ VLC_ADD_PLUGIN([dvdread])
+	      VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}])
+	    ],[
+	      if test -n "${enable_dvdread}"
+	      then
+	      AC_MSG_ERROR([cannot find libdvdread headers])
+	     fi
+	   ])
+	])
     else
       AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree})
       real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`"
@@ -2139,7 +2152,8 @@ dnl
 dnl  Windows DirectShow BDA access module
 dnl
 AC_ARG_ENABLE(bda,
-  [  --enable-bda            Win32 DirectShow BDA support (default enabled on Win32)])
+  AS_HELP_STRING([--enable-bda],[Win32 DirectShow BDA support (default 
+		  enabled on Win32)]))
 if test "${enable_bda}" != "no"
 then
   if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
@@ -2439,7 +2453,8 @@ dnl
 dnl  VCDX and CDDAX modules
 dnl
 AC_ARG_ENABLE(cddax,
-  [  --enable-cddax          audio CD plugin with CD Text and CD paranoia via libcdio (default disabled)])
+  AS_HELP_STRING([--enable-cddax],[audio CD plugin with CD Text and CD paranoia
+		  via libcdio (default disabled)]))
  
 AC_ARG_ENABLE(libcddb,
   [  --enable-libcddb        CDDB support for libcdio audio CD (default enabled)])
@@ -2967,7 +2982,8 @@ dnl  swscale image scaling and conversion plugin
 dnl
 
 AC_ARG_ENABLE(swscale,
-[  --enable-swscale        libswscale image scaling and conversion (default enabled)])
+  AS_HELP_STRING([--enable-swscale],[libswscale image scaling and conversion 
+		  (default enabled)]))
 if test "${enable_swscale}" != "no"
 then
   PKG_CHECK_MODULES(SWSCALE,[libswscale],
@@ -2995,7 +3011,8 @@ dnl  from VLC.
 dnl
 
 AC_ARG_ENABLE(imgresample,
-[  --enable-imgresample    deprecated libavcodec image scaling and conversion (default disabled)])
+  AS_HELP_STRING([--enable-imgresample],[deprecated libavcodec image scaling 
+		  and conversion (default disabled)]))
 if test "${enable_imgresample}" = "yes"
 then
   PKG_CHECK_MODULES(IMGRESAMPLE,[libavcodec],
@@ -3291,7 +3308,8 @@ AS_IF([test "x${with_dts_tree}" != "x"], [
 ])
 
 AC_ARG_ENABLE(dca,
-  [  --enable-dca            DTS Coherent Acoustics support with libdca (default enabled)])
+  AS_HELP_STRING([--enable-dca],[DTS Coherent Acoustics support with libdca 
+		  (default enabled)]))
 AS_IF([test "${enable_dca}" != "no"], [
   AC_ARG_WITH(dca-tree,
     [    --with-dca-tree=PATH  libdca tree for static linking],,
@@ -3580,6 +3598,22 @@ if test "${enable_dirac}" = "yes"; then
   ])
 fi
 
+dnl
+dnl  schroedinger decoder plugin (for dirac format video)
+dnl
+AC_ARG_ENABLE(schroedinger,
+[  --disable-schroedinger   high performance dirac codec (default enabled)])
+if test "${enable_schroedinger}" != "no"; then
+  PKG_CHECK_MODULES(SCHROEDINGER,[schroedinger-1.0 >= 1.0], [
+      VLC_ADD_PLUGIN([schroedinger])
+      VLC_ADD_CFLAGS([schroedinger],[$SCHROEDINGER_CFLAGS])
+      VLC_ADD_LIBS([schroedinger],[$SCHROEDINGER_LIBS]) ], [
+        AS_IF([test "x${enable_schroedinger}" != "x"], [
+          AC_MSG_ERROR([${SCHROEDINGER_PKG_ERRORS}])
+        ])
+])
+fi
+
 dnl
 dnl  PNG decoder module
 dnl
@@ -3674,9 +3708,11 @@ dnl telx module
 dnl uncompatible
 dnl
 AC_ARG_ENABLE(zvbi,
-  [  --enable-zvbi           VBI (inc. Teletext) decoding support with libzvbi (default enabled)])
+  AS_HELP_STRING([--enable-zvbi],[VBI (inc. Teletext) decoding support with 
+		  libzvbi (default enabled)]))
 AC_ARG_ENABLE(telx,
-  [  --enable-telx           Teletext decoding module (conflicting with zvbi) (default disabled)])
+  AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with 
+		  zvbi) (default disabled)]))
 
 AS_IF( [test "${enable_zvbi}" != "no"],[
   AS_IF( [test "${enable_telx}" = "yes"],[
@@ -3727,6 +3763,9 @@ AS_IF( [test "${enable_asademux}" = "yes"], [
       [
         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)])
@@ -4719,7 +4758,7 @@ dnl
 dnl UPnP Plugin (Intel SDK)
 dnl
 AC_ARG_ENABLE(upnp,
-  [AS_HELP_STRING([--enable-upnp],[Intel UPnP SDK (default enabled)])])
+  AS_HELP_STRING([--enable-upnp],[Intel UPnP SDK (default enabled)]))
 
 VLC_ADD_CXXFLAGS([upnp_intel], [ ])
 AS_IF([test "x${enable_upnp}" != "xno"], [
@@ -4940,7 +4979,7 @@ then
  
   ORIGCFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -x objective-c"
-  AC_CHECK_HEADER(QuartzCore/CALayer.h, 
+  AC_TRY_COMPILE([#import <QuartzCore/CALayer.h>], 
   [VLC_ADD_PLUGIN([opengllayer])
   VLC_ADD_OBJCFLAGS([opengllayer], [-isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5])])
   CFLAGS=$ORIGCFLAGS
@@ -5120,7 +5159,8 @@ dnl  AtmoLight (homebrew AmbiLight)
 dnl
 if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then
    AC_ARG_ENABLE(atmo,
-[  --disable-atmo          AtmoLight (homebrew philips ambilight) (default enabled)])
+AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew philips ambilight) 
+		(default enabled)]))
    if test "${enable_atmo}" != "no"; then
       AC_LANG_PUSH(C++)
       VLC_ADD_PLUGIN([atmo])
@@ -5256,7 +5296,8 @@ dnl  DLL loader copied from MPlayer copied from somewhere else (WINE ?)
 dnl
 loader=false
 AC_ARG_ENABLE(loader,
-  [  --enable-loader         build DLL loader for ELF i386 platforms (default disabled)])
+  AS_HELP_STRING([--enable-loader],[build DLL loader for ELF i386 platforms 
+		  (default disabled)]))
 AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
 AS_IF([test "${enable_loader}" = "yes"],
   [ VLC_ADD_PLUGIN([dmo])
@@ -5284,7 +5325,8 @@ dnl  Microsoft ActiveX support
 dnl
 activex=false
 AC_ARG_ENABLE(activex,
-  [  --enable-activex        build a vlc-based ActiveX control (default enabled on Win32)])
+  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])
 if test "${enable_activex}" != "no"
@@ -5334,7 +5376,8 @@ dnl  Mozilla plugin
 dnl
 mozilla=false
 AC_ARG_ENABLE(mozilla,
-  [  --enable-mozilla        build a vlc-based Firefox/Mozilla plugin (default disabled)])
+  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])
 AC_LANG_PUSH(C++)
@@ -5696,7 +5739,7 @@ dnl  Handle substvars that use $(top_srcdir)
 dnl
 VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
 AC_SUBST(VLC_CONFIG)
-CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include -I\$(top_builddir)/include"
+CPPFLAGS_save="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS_save}"
 
 dnl
 dnl  Restore *FLAGS