Add misc/atomic.c to SOURCES_libvlc_symbian and fix indentation

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6333e1eb539ba0f15c01de5719b8fccffc851b26..1541ba30d0a2d5472699224dd126b04775600997 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
+AC_COPYRIGHT([Copyright 2002-2011 the VideoLAN team])
 
 AC_INIT(vlc, 1.2.0-git)
 VERSION_MAJOR="1"
@@ -12,7 +12,7 @@ AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Twoflower"
-COPYRIGHT_YEARS="1996-2010"
+COPYRIGHT_YEARS="1996-2011"
 
 AC_CONFIG_SRCDIR(src/libvlc.c)
 AC_CONFIG_AUX_DIR(autotools)
@@ -95,7 +95,7 @@ AS_IF([test -n "${with_binary_version}"],[
 ])
 
 dnl Check how we are asked to build
-AS_IF([test "${enable_shared}" = "no"], [
+AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [
   AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.])
 ])
 
@@ -338,7 +338,7 @@ case "${host_os}" in
         AC_ARG_ENABLE(peflags,
           [  --enable-peflags        peflags use (default enabled on Windows)])
         if test "${enable_peflags}" != "no" ; then
-          AC_CHECK_TOOL(PEFLAGS, peflags, :)
+          AC_PATH_TOOL(PEFLAGS, peflags, :)
         fi
         AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
         ac_default_prefix="`pwd`/_win32"
@@ -389,6 +389,7 @@ AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"])
 AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
 AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
 AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
+AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
 AM_CONDITIONAL(USE_PEFLAGS, [test "${enable_peflags}" = "yes"])
 
 dnl
@@ -546,7 +547,7 @@ dnl Check for system libs needed
 need_libc=false
 
 dnl Check for usual libc functions
-AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp uselocale])
+AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp uselocale])
 AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf])
 AC_CHECK_FUNCS(fdatasync,,
   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
@@ -1685,7 +1686,7 @@ AS_IF([test "${enable_growl}" != "no"], [
 dnl
 dnl Libnotify notification plugin
 dnl
-PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify], [libnotify notification], [auto])
+PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-2.0], [libnotify notification], [auto])
 
 dnl
 dnl Taglibplugin
@@ -1838,10 +1839,27 @@ fi
 dnl
 dnl - special access module for dc1394 input
 dnl - dv module: digital video module check for libraw1394
+dnl - linsys modules: access module check for libzvbi
 dnl
 PKG_ENABLE_MODULES_VLC([DC1394], [], [libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0], [dc1394 access module], [auto])
 PKG_ENABLE_MODULES_VLC([DV], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto])
 
+AC_ARG_ENABLE(linsys,
+  [  --enable-linsys         Linux Linear Systems Ltd. SDI and HD-SDI input cards (default enabled)])
+case "${SYS}" in
+    linux*)
+if test "${enable_linsys}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
+  VLC_ADD_PLUGIN([linsys_hdsdi])
+  PKG_CHECK_MODULES(LINSYS_SDI, zvbi-0.2 >= 0.2.28,
+    [ VLC_ADD_LIBS([linsys_sdi],[$LINSYS_SDI_LIBS])
+      VLC_ADD_CFLAGS([linsys_sdi],[$LINSYS_SDI_CFLAGS])
+      VLC_ADD_PLUGIN([linsys_sdi]) ],
+    [AC_MSG_WARN([Couldn't find zvbi >= 0.2.28, install libzvbi-dev ?])]
+  )
+fi
+;;
+esac
+
 dnl
 dnl dvdread module: check for libdvdread
 dnl
@@ -2309,6 +2327,12 @@ AS_IF([test "${enable_gme}" != "no"], [
 ])
 
 
+dnl
+dnl  SIDPlay plugin
+dnl
+PKG_ENABLE_MODULES_VLC([SID], [], [libsidplay2], [C64 sid demux support], [auto], [], [-lresid-builder])
+
+
 dnl
 dnl  ogg demux plugin
 dnl
@@ -2445,6 +2469,29 @@ then
   VLC_ADD_LIBS([omxil], [$LIBDL])
 fi
 
+dnl
+dnl CrystalHD codec plugin
+dnl
+AC_ARG_ENABLE(crystalhd,
+  [  --enable-crystalhd       crystalhd codec plugin (default disabled)])
+if test "${enable_crystalhd}" == "yes"; then
+    AC_CHECK_HEADERS(libcrystalhd/libcrystalhd_if.h, [
+      VLC_ADD_PLUGIN([crystalhd])
+      VLC_ADD_LIBS([crystalhd], [-lcrystalhd])
+    ],[
+      if test "${SYS}" = "mingw32" ; then
+        AC_CHECK_HEADERS(libcrystalhd/bc_dts_defs.h, [
+          VLC_ADD_PLUGIN([crystalhd])
+          AC_CHECK_HEADERS(libcrystalhd/bc_drv_if.h, [
+            VLC_ADD_LIBS([crystalhd], [-lbcmDIL])
+            ])
+        ],[
+          AC_MSG_ERROR("Could not find CrystalHD development headers")
+        ])
+      fi
+    ])
+fi
+
 dnl
 dnl  mad plugin
 dnl
@@ -2941,7 +2988,7 @@ PKG_ENABLE_MODULES_VLC([DIRAC], [], [dirac >= 0.10.0], [dirac encoder], [auto])
 dnl
 dnl  schroedinger decoder plugin (for dirac format video)
 dnl
-PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.6], [dirac decoder using schroedinger], [auto])
+PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.10], [dirac decoder and encoder using schroedinger], [auto])
 
 dnl
 dnl  PNG decoder module
@@ -4178,8 +4225,8 @@ AM_CONDITIONAL([HAVE_SQLITE], [test "${enable_sqlite}" != "no"])
 dnl
 dnl media library
 dnl
-AC_ARG_ENABLE(media-library, [--enable-media-library media library (default auto)])
-if test "${enable_media_library}" != "no"; then
+AC_ARG_ENABLE(media-library, [--enable-media-library media library (default disabled)])
+if test "${enable_media_library}" == "yes"; then
     if test "${enable_sqlite}" != "yes"; then
         if test "${enable_media_library}" == "yes"; then
             AC_MSG_ERROR([SQLite module is required for the media library])
@@ -4192,6 +4239,7 @@ if test "${enable_media_library}" != "no"; then
        VLC_ADD_PLUGIN([media_library])
     fi
 fi
+AM_CONDITIONAL([ENABLE_MEDIA_LIBRARY], [test "${enable_media_library}" = "yes"])
 
 dnl
 dnl  Endianness check
@@ -4426,7 +4474,6 @@ AC_CONFIG_FILES([
   modules/misc/playlist/Makefile
   modules/misc/osd/Makefile
   modules/misc/stats/Makefile
-  modules/misc/xml/Makefile
   modules/media_library/Makefile
   modules/mux/Makefile
   modules/mux/mpeg/Makefile