Commit 97db316e authored by Sam Hocevar's avatar Sam Hocevar

* configure.ac: don't use -maltivec -mabi=altivec, because we don't want

    to trigger AltiVec optimisations in our generic code.
parent 20881778
...@@ -1065,13 +1065,13 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], ...@@ -1065,13 +1065,13 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions],
AC_TRY_COMPILE([], AC_TRY_COMPILE([],
[vec_ld(0, (unsigned char *)0);], [vec_ld(0, (unsigned char *)0);],
[ac_cv_c_altivec="-faltivec"], [ac_cv_c_altivec="-faltivec"],
[# Linux/PPC test [# Linux/PPC test (no flags)
CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -maltivec -mabi=altivec" CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec}"
AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H
#include <altivec.h> #include <altivec.h>
#endif], #endif],
[vec_ld(0, (unsigned char *)0);], [vec_ld(0, (unsigned char *)0);],
[ac_cv_c_altivec="-maltivec -mabi=altivec"], [ac_cv_c_altivec=""],
[# Linux/PPC test (old GCC versions) [# Linux/PPC test (old GCC versions)
CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -fvec" CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -fvec"
AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H
...@@ -1774,6 +1774,23 @@ AC_ARG_ENABLE(ffmpeg, ...@@ -1774,6 +1774,23 @@ AC_ARG_ENABLE(ffmpeg,
[ --enable-ffmpeg ffmpeg codec (default enabled)]) [ --enable-ffmpeg ffmpeg codec (default enabled)])
if test "${enable_ffmpeg}" != "no" if test "${enable_ffmpeg}" != "no"
then then
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}:${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_CHECK_HEADERS(postproc/postprocess.h)
VLC_ADD_PLUGINS([ffmpeg stream_out_transcode])
VLC_ADD_CFLAGS([ffmpeg stream_out_transcode],[`${FFMPEG_CONFIG} --cflags`])
VLC_ADD_LDFLAGS([ffmpeg],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`])
VLC_ADD_LDFLAGS([stream_out_transcode],[`${FFMPEG_CONFIG} --libs avcodec`])
else
AC_ARG_WITH(ffmpeg-mp3lame, AC_ARG_WITH(ffmpeg-mp3lame,
[ --with-ffmpeg-mp3lame if ffmpeg has been compiled with mp3lame support], [ --with-ffmpeg-mp3lame if ffmpeg has been compiled with mp3lame support],
[ [
...@@ -1854,6 +1871,7 @@ then ...@@ -1854,6 +1871,7 @@ then
VLC_ADD_LDFLAGS([stream_out_transcode],[-L${real_ffmpeg_tree}/libavcodec]) VLC_ADD_LDFLAGS([stream_out_transcode],[-L${real_ffmpeg_tree}/libavcodec])
VLC_ADD_CPPFLAGS([stream_out_transcode],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat]) VLC_ADD_CPPFLAGS([stream_out_transcode],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
fi fi
fi
fi fi
dnl dnl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment