dnl Autoconf settings for vlc
-AC_INIT(vlc,0.6.0-test2)
+AC_INIT(vlc,0.6.0-test3)
CONFIGURE_LINE="$0 $*"
-CODENAME="Natalya"
+CODENAME="Trevelyan"
AC_PREREQ(2.50)
AC_CONFIG_SRCDIR(src/libvlc.c)
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.6.0-test2)
+AM_INIT_AUTOMAKE(vlc,0.6.0-test3)
AM_CONFIG_HEADER(config.h)
dnl
dnl Check for system libs needed
need_libc=false
-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 atoll getenv putenv setenv)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv)
dnl Check for usual libc functions
AC_CHECK_FUNCS(strdup strndup atof lseek)
ac_cv_type_socklen_t=yes,
ac_cv_type_socklen_t=no)])
if test x$ac_cv_type_socklen_t != xno; then
- AC_DEFINE(HAVE_SOCKLEN_T, 1,
- Define if <sys/socket.h> defines socklen_t.)
+ AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define if <sys/socket.h> defines socklen_t.])
+fi
+
+dnl Check for va_copy
+AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy,
+ AC_TRY_LINK(
+ [#include <stdarg.h>],
+ [va_list ap1, ap2; va_copy(ap1,ap2);],
+ [ac_cv_c_va_copy="yes"],
+ [ac_cv_c_va_copy="no"]))
+if test "$ac_cv_c_va_copy" = "yes"; then
+ AC_DEFINE(HAVE_VA_COPY, 1, [Define if <stdarg.h> defines va_copy.])
+fi
+AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy,
+ AC_TRY_LINK(
+ [#include <stdarg.h>],
+ [va_list ap1, ap2; __va_copy(ap1,ap2);],
+ [ac_cv_c___va_copy="yes"],
+ [ac_cv_c___va_copy="no"]))
+if test "$ac_cv_c___va_copy" = "yes"; then
+ AC_DEFINE(HAVE___VA_COPY, 1, [Define if <stdarg.h> defines __va_copy.])
fi
AC_CHECK_FUNCS(inet_aton,,[
case "${ARCH}" in
hppa64)
- CFLAGS_mpeg_video="${CFLAGS_mpeg_video} -ffunction-sections"
+ CFLAGS_mpeg_video_old="${CFLAGS_mpeg_video_old} -ffunction-sections"
;;
esac
dnl
dnl default modules
dnl
-#BUILTINS="${BUILTINS} mpeg_video idct idctclassic motion"
+#BUILTINS="${BUILTINS} mpeg_video_old idct idctclassic motion"
PLUGINS="${PLUGINS} dummy rc logger gestures memcpy"
PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv"
PLUGINS="${PLUGINS} spudec mpeg_audio lpcm a52 dts cinepak"
PLUGINS="${PLUGINS} access_file access_udp access_http ipv4 access_mms"
PLUGINS="${PLUGINS} access_ftp access_directory sap httpd http"
+dnl
+dnl Switch to enable a version of VLC where most modules will be builtin
+dnl
+AC_ARG_ENABLE(mostly-builtin,
+[ --enable-mostly-builtin most modules will be built-in (default disabled)])
+if test "x${enable_mostly_builtin}" = "xyes"; then
+ BUILTINS="${BUILTINS} ${PLUGINS}"
+ PLUGINS=""
+fi
+
dnl
dnl Some plugins aren't useful on some platforms
dnl
dnl dvdplay module: check for libdvdplay
dnl
AC_ARG_ENABLE(dvdplay,
-[ --enable-dvdplay dvdplay input module (default disabled)])
+[ --enable-dvdplay dvdplay input module (default enabled)])
if test "x${enable_dvdplay}" != "xno"
then
AC_ARG_WITH(dvdplay,
],[])
fi
+dnl
+dnl special access module for Hauppauge PVR cards
+dnl
+AC_ARG_ENABLE(pvr,
+ [ --enable-pvr PVR cards access module (default disabled)])
+if test "x${enable_pvr}" = "xyes"
+then
+ PLUGINS="${PLUGINS} pvr"
+fi
+
dnl
dnl VCD module
dnl
CPPFLAGS_encoder_ffmpeg="${CPPFLAGS_ffmpeg}"
dnl XXX: we don't link with -lavcodec blah blah blah
#LDFLAGS_encoder_ffmpeg="${LDFLAGS_ffmpeg}"
-
- dnl Add postprocessing modules
- PLUGINS="${PLUGINS} postprocessing_c"
- if test "x${ac_cv_mmx_inline}" != "xno"; then
- PLUGINS="${PLUGINS} postprocessing_mmx"
- fi
-
- if test "x${ac_cv_mmxext_inline}" != "xno"; then
- PLUGINS="${PLUGINS} postprocessing_mmxext"
- fi
fi
dnl
[ --enable-faad faad codec (default disabled)])
if test "x${enable_faad}" = "xyes"
then
- AC_ARG_WITH(faad,
- [ --with-faad=PATH path to faad installation],[],[])
- if test "x${with_faad}" != "xno" -a "x${with_faad}" != "x"
- then
- CPPFLAGS_faad="${CPPFLAGS_faad} -I${with_faad}/include"
- LDFLAGS_faad="${LDFLAGS_faad} -L${with_faad}/lib"
- fi
- LDFLAGS_faad="${LDFLAGS_faad}"
-
AC_ARG_WITH(faad-tree,
[ --with-faad-tree=PATH faad tree for static linking])
if test "x${with_faad_tree}" != "x"
BUILTINS="${BUILTINS} faad"
LDFLAGS_faad="${LDFLAGS_faad} -L${real_faad_tree}/libfaad/.libs -lfaad"
CPPFLAGS_faad="${CPPFLAGS_faad} -I${real_faad_tree}/include"
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_faad}"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_faad}"
+ AC_TRY_COMPILE([#include <faad.h>],
+ [faacDecHandle a; faacDecFrameInfo *b; unsigned char *c;
+ unsigned long d; faacDecDecode(a,b,c,d);],
+ [], [AC_DEFINE(HAVE_OLD_FAAD2, 1, Define if FAAD2 < 1.2)])
+ LDFLAGS="${LDFLAGS_save}"
+ CPPFLAGS="${CPPFLAGS_save}"
else
dnl The given libfaad wasn't built
AC_MSG_RESULT(no)
[ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ])
AC_CHECK_LIB(faad, faacDecOpen, [
PLUGINS="${PLUGINS} faad"
- LDFLAGS_faad="${LDFLAGS_faad} -lfaad" ],
+ LDFLAGS_faad="${LDFLAGS_faad} -lfaad"
+ AC_TRY_COMPILE([#include <faad.h>],
+ [faacDecHandle a; faacDecFrameInfo *b; unsigned char *c;
+ unsigned long d; faacDecDecode(a,b,c,d);],
+ [], [AC_DEFINE(HAVE_OLD_FAAD2, 1, Define if FAAD2 < 1.2)]) ],
[ AC_MSG_ERROR([Cannot find libfaad library...]) ])
LDFLAGS="${LDFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
LDFLAGS_skins="${LDFLAGS_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lstdc++ -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32"
else
if test "x${enable_skins}" = "xyes"; then
-
- AC_ARG_WITH(gtk2-skins,
- [ --with-gtk2-skins skins using GTK2 (default disabled)])
-
- if test "x${with_gtk2_skins}" = "xyes"; then
- PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
- CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -fno-rtti -Imodules/gui/skins ${GTK2_CFLAGS} -DGTK2_SKINS"
- LDFLAGS_skins="${LDFLAGS_skins} -lstdc++ ${GTK2_LIBS}"
- else
- IMLIB2_PATH="${PATH}"
- AC_PATH_PROG(IMLIB2_CONFIG_SKINS, imlib2-config, no, ${IMLIB2_PATH})
- PLUGINS="${PLUGINS} skins"
- CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -fno-rtti -Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS"
- LDFLAGS_skins="${LDFLAGS_skins} -lstdc++ -L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`"
+ IMLIB2_PATH="${PATH}"
+ AC_PATH_PROG(IMLIB2_CONFIG_SKINS, imlib2-config, no, ${IMLIB2_PATH})
+ if test "x${IMLIB2_CONFIG_SKINS}" = "xno"; then
+ AC_MSG_ERROR([Couldn't find the imlib2 package. You can download imlib2 from http://enlightenment.org/, or configure with --disable-skins.])
fi
PLUGINS="${PLUGINS} skins"
-
+ CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -fno-rtti -Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS"
+ LDFLAGS_skins="${LDFLAGS_skins} -lstdc++ -L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`"
+ PLUGINS="${PLUGINS} skins"
fi
fi
fi
LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lstdc++ -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32"
else
- AC_ARG_WITH(gtk2-basic-skins,
- [ --with-gtk2-basic-skins skins using GTK2 (default disabled)])
-
- if test "x${with_gtk2_basic_skins}" = "xyes"; then
- PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
- CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -O2 -fno-rtti -Imodules/gui/skins ${GTK2_CFLAGS} -DGTK2_SKINS"
- LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -lstdc++ ${GTK2_LIBS}"
- else
- IMLIB2_PATH="${PATH}"
- AC_PATH_PROG(IMLIB2_CONFIG_SKINS, imlib2-config, no, ${IMLIB2_PATH})
- CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -O2 -fno-rtti -Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS"
- LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -lstdc++ -L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`"
+ IMLIB2_PATH="${PATH}"
+ AC_PATH_PROG(IMLIB2_CONFIG_SKINS, imlib2-config, no, ${IMLIB2_PATH})
+ if test "x${IMLIB2_CONFIG_SKINS}" = "xno"; then
+ AC_MSG_ERROR([Couldn't find the imlib2 package. You can download imlib2 from http://enlightenment.org/, or configure with --disable-basic-skins.])
fi
+ CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -O2 -fno-rtti -Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS"
+ LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -lstdc++ -L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`"
fi
PLUGINS="${PLUGINS} basic_skins"
projects / vlc / blobdiff