OBJCFLAGS="${OBJCFLAGS} -I${topdir}/extras/contrib/include"
OBJCFLAGS_save="${OBJCFLAGS_save} -I${topdir}/extras/contrib/include"
if test $build = $host -o "$PKG_CONFIG_LIBDIR"; then
- export PKG_CONFIG_PATH=${topdir}/extras/contrib/lib/pkgconfig:$PKG_CONFIG_PATH
+ export PKG_CONFIG_PATH=${topdir}/extras/contrib/lib/pkgconfig:$PKG_CONFIG_PATH
else
- export PKG_CONFIG_LIBDIR=${topdir}/extras/contrib/lib/pkgconfig
+ export PKG_CONFIG_LIBDIR=${topdir}/extras/contrib/lib/pkgconfig
fi
LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib"
LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib"
-dnl kludge because only the debian package provides a ffmpeg-config
- if test -z $with_ffmpeg_config_path; then
- with_ffmpeg_config_path=${topdir}/extras/contrib/bin;
- fi
if test -z $with_live555_tree; then
with_live555_tree=${topdir}/extras/contrib/src/live
fi
echo " Assuming --disable-glx"
enable_xvideo="no"
echo " Assuming --disable-xvideo"
+
+ with_macosx_sdk="yes"
+ echo " Assuming --with-macosx-sdk"
fi
if test ".`uname -p`" = ".i386"; then
dnl Due to a ld(64) bug in 10.5 we cannot use our mmx code
dnl (that bug is about ld being unable to handle
dnl text relocation)
save_cflags="$CFLAGS"
- CFLAGS="$CFLAGS -dynamiclib"
+ CFLAGS="$CFLAGS -dynamiclib -single_module -read_only_relocs suppress"
AC_TRY_LINK(
[int a;], [asm("movq _a,%mm0\n");],
ac_ld_does_not_support_text_reloc=no,
echo " Assuming --disable-mmx (due to a bug in ld)"
enable_sse="no"
echo " Assuming --disable-sse (due to a bug in ld)"
+ enable_ffmpeg="no"
+ echo " Assuming --disable-ffmpeg (due to a bug in ld)"
fi
fi
;;
VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
VLC_ADD_PLUGINS([packetizer_vc1])
+ALIASES="${ALIASES} cvlc"
+
dnl
dnl default modules that need g++
dnl
VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record access_filter_dump])
VLC_ADD_PLUGINS([gestures rc telnet hotkeys showintf marq podcast shout sap fake folder])
VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop erase bluescreen alphamask gaussianblur])
- VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga])
+ VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga i422_i420])
VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])
VLC_ADD_PLUGINS([float32_mixer spdif_mixer simple_channel_mixer])
VLC_ADD_PLUGINS([dolby_surround_decoder headphone_channel_mixer normvol equalizer param_eq])
VLC_ADD_PLUGINS([converter_float a52tospdif dtstospdif audio_format])
+ ALIASES="${ALIASES} rvlc"
fi
dnl
fi
dnl
-dnl Video4Linux plugin
+dnl Video4Linux2 plugin
dnl
AC_ARG_ENABLE(v4l2,
[ --enable-v4l2 Video4Linux2 input support (default disabled)])
VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include])
fi
+ AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_v4l2_alsa="true", have_v4l2_alsa="false"),have_v4l2_alsa="false")
+ if test "${have_v4l2_alsa}" = "true"
+ then
+ CFLAGS="${CFLAGS_save}"
+ AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API
+ #define ALSA_PCM_NEW_SW_PARAMS_API
+ #include <alsa/asoundlib.h>],
+ [snd_pcm_hw_params_get_period_time(0,0,0);],
+ AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4))
+ VLC_ADD_LDFLAGS([v4l2],[-lasound -lm -ldl])
+ AC_DEFINE(HAVE_ALSA, 1, Define if ALSA is present.)
+ fi
+
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
AC_CHECK_HEADERS(linux/videodev2.h, [
VLC_ADD_PLUGINS([v4l2])
dnl
dnl ffmpeg decoder/demuxer plugin
dnl
-dnl we try to find ffmpeg using : 1- given tree 2- ffmpeg-config, 3- pkg-config
-dnl 4- default place,
+dnl we try to find ffmpeg using : 1- given tree, 2- pkg-config
+dnl 3- default place,
AC_ARG_ENABLE(ffmpeg,
[ --enable-ffmpeg ffmpeg codec (default enabled)])
fi])
AC_ARG_WITH(ffmpeg-x264,
- [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libamrnb support],
+ [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libx264 support],
[
if test "$with_ffmpeg_x264" = "yes"; then
VLC_ADD_LIBS([ffmpeg],[-lx264])
],[
unset PKG_CONFIG_PATH
])
- AS_IF([test -n "${PKG_CONFIG_LIBDIR_save}"],[
+ AS_IF([test -n "${PKG_CONFIG_LIBDIR_save}"],[
export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR_save}"
],[
unset PKG_CONFIG_LIBDIR
fi
else
-dnl Look for a ffmpeg-config (we are on debian )
-
- FFMPEG_PATH="${PATH}"
- AC_ARG_WITH(ffmpeg-config-path,
- [ --with-ffmpeg-config-path=PATH ffmpeg-config path (default search in \$PATH)],
- [ if test "${with_ffmpeg_config_path}" != "no"
- then
- FFMPEG_PATH="${with_ffmpeg_config_path}"
- fi ])
- AC_PATH_PROG(FFMPEG_CONFIG, ffmpeg-config, no, ${FFMPEG_PATH})
- if test "${FFMPEG_CONFIG}" != "no"
- then
- AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
- AC_CHECK_HEADERS(ffmpeg/avformat.h)
- AC_CHECK_HEADERS(ffmpeg/avutil.h)
- AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
- VLC_ADD_PLUGINS([ffmpeg])
- if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; then
- VLC_ADD_PLUGINS([stream_out_switcher])
- fi
- VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --cflags`])
- VLC_ADD_LIBS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`])
-
- else
dnl Trying with pkg-config
PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
CPPFLAGS="${CPPFLAGS_save}"
])
fi
- fi
fi
dnl
AC_CHECK_LIB(png, png_set_rows, [
VLC_ADD_LIBS([png],[-lpng -lz])
VLC_ADD_PLUGINS([png])
- VLC_ADD_PLUGINS([osdmenu])
+ VLC_ADD_PLUGINS([osdmenu osd_parser])
AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])],
[],[-lz])
LDFLAGS="${LDFLAGS_save}"
[AC_CHECK_LIB(ncursesw, mvprintw,
[VLC_ADD_PLUGINS([ncurses])
VLC_ADD_LIBS([ncurses],[-lncursesw])
+ ALIASES="${ALIASES} nvlc"
AC_DEFINE([HAVE_NCURSESW], 1, [Define to 1 if you have libncursesw.])
],
[AC_CHECK_LIB( ncurses, mvprintw,
[VLC_ADD_PLUGINS([ncurses])
+ ALIASES="${ALIASES} nvlc"
VLC_ADD_LIBS([ncurses],[-lncurses])],
[AS_IF([test "x${enable_ncurses}" != "x"], [
AC_MSG_ERROR([libncurses not found])])]
dnl
AC_ARG_ENABLE(libgcrypt,
[ --enable-libgcrypt libgcrypts support (default enabled)])
-if test "${enable_libgcrypt}" != "no" -a "${enable_gnutls}" != "no"i
+if test "${enable_libgcrypt}" != "no" -a "${enable_gnutls}" != "no"
then
dnl Workaround for cross-compiling since AM_PATH_LIBGRYPT doesn't dectect
dnl it and looks for libgcrypt headers in the wrong place.
AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
dnl New definitions with value matching 0.9.0 release
-module_symbol="0_9_0b"
+module_symbol="0_9_0c"
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions])
VLC_ENTRY="vlc_entry__${module_symbol}"
modules/misc/notify/Makefile
modules/misc/testsuite/Makefile
modules/misc/playlist/Makefile
+ modules/misc/osd/Makefile
modules/misc/xml/Makefile
modules/misc/probe/Makefile
modules/mux/Makefile
You can tune the compiler flags in vlc-config.
To build vlc and its plugins, type \`./compile' or \`make'.
"
-
+if test "x$ac_ld_does_not_support_text_reloc" = "xyes"; then
+ echo ""
+ echo "Warning: Due to a bug in ld, mmx/sse support has been"
+ echo " turned off."
+ echo " More over FFmpeg support has been disabled."
+ echo " VLC WILL NOT BE ABLE TO PLAY MOST FILES."
+ echo ""
+fi