Re #1219: added configure option to specify ffmpeg path
git-svn-id: https://svn.pjsip.org/repos/pjproject/branches/projects/2.0-dev@3533 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
parent
eda0609932
commit
c8ef0ac966
22
aconfigure
22
aconfigure
|
@ -729,6 +729,7 @@ enable_ilbc_codec
|
|||
enable_libsamplerate
|
||||
enable_sdl
|
||||
enable_ffmpeg
|
||||
with_ffmpeg
|
||||
enable_v4l2
|
||||
enable_ipp
|
||||
with_ipp
|
||||
|
@ -1409,6 +1410,7 @@ Optional Packages:
|
|||
set, make sure that PortAudio is accessible to use
|
||||
(hint: use CFLAGS and LDFLAGS env var to set the
|
||||
include/lib paths)
|
||||
--with-ffmpeg=DIR Specify alternate FFMPEG prefix
|
||||
--with-ipp=DIR Specify the Intel IPP location
|
||||
--with-ipp-samples=DIR Specify the Intel IPP samples location
|
||||
--with-ipp-arch=ARCH Specify the Intel IPP ARCH suffix, e.g. "64" or
|
||||
|
@ -5921,6 +5923,15 @@ else
|
|||
|
||||
|
||||
|
||||
FFMPEG_PREFIX=""
|
||||
if test "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x"; then
|
||||
FFMPEG_PREFIX=$with_ffmpeg
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
|
||||
$as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }
|
||||
LIBS="-L$FFMPEG_PREFIX/lib $LIBS"
|
||||
CFLAGS="-I$FFMPEG_PREFIX/include $CFLAGS"
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avdevice_version in -lavdevice" >&5
|
||||
$as_echo_n "checking for avdevice_version in -lavdevice... " >&6; }
|
||||
if test "${ac_cv_lib_avdevice_avdevice_version+set}" = set; then :
|
||||
|
@ -6185,6 +6196,17 @@ fi
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-ffmpeg was given.
|
||||
if test "${with_ffmpeg+set}" = set; then :
|
||||
withval=$with_ffmpeg;
|
||||
else
|
||||
with_ffmpeg=no
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-v4l2 was given.
|
||||
if test "${enable_v4l2+set}" = set; then :
|
||||
enableval=$enable_v4l2;
|
||||
|
|
|
@ -784,6 +784,15 @@ AC_ARG_ENABLE(ffmpeg,
|
|||
AC_SUBST(ac_ffmpeg_cflags)
|
||||
AC_SUBST(ac_ffmpeg_ldflags)
|
||||
|
||||
FFMPEG_PREFIX=""
|
||||
if test "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x"; then
|
||||
FFMPEG_PREFIX=$with_ffmpeg
|
||||
AC_MSG_RESULT([Using ffmpeg prefix... $FFMPEG_PREFIX])
|
||||
LIBS="-L$FFMPEG_PREFIX/lib $LIBS"
|
||||
LDFLAGS="-L$FFMPEG_PREFIX/lib $LDFLAGS"
|
||||
CFLAGS="-I$FFMPEG_PREFIX/include $CFLAGS"
|
||||
fi
|
||||
|
||||
AC_CHECK_LIB(avdevice,
|
||||
avdevice_version,
|
||||
[ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1"
|
||||
|
@ -824,6 +833,14 @@ AC_ARG_ENABLE(ffmpeg,
|
|||
]
|
||||
)
|
||||
|
||||
AC_ARG_WITH(ffmpeg,
|
||||
AC_HELP_STRING([--with-ffmpeg=DIR],
|
||||
[Specify alternate FFMPEG prefix]),
|
||||
[],
|
||||
[with_ffmpeg=no]
|
||||
)
|
||||
|
||||
|
||||
dnl # Video for Linux 2
|
||||
AC_ARG_ENABLE(v4l2,
|
||||
AC_HELP_STRING([--disable-v4l2],
|
||||
|
|
Loading…
Reference in New Issue