ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified comment and example for lame include. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@990 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2004-03-22 10:33:22 +00:00
parent cf48048974
commit 9668e30b77
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -1699,7 +1699,7 @@ MYSQL_CFLAGS="-I${MYSQL_PREFIX}/include"
LDFLAGS="${MYSQL_LIBS} $LDFLAGS"
FFMPEG_PREFIX=
# Ask group for ffmpeg:.
# Ask for ffmpeg path:.
# Check whether --with-ffmpeg or --without-ffmpeg was given.
if test "${with_ffmpeg+set}" = set; then
@ -1711,13 +1711,13 @@ else
and libavformat files that can be used to build true MPEG streaming into ZoneMinder. A normal
install of ffmpeg only installs the applications and not the libraries or headers necessary
to link to so this will probably be a local or temporary directory.
e.g. --with-ffmpeg=/home/ffmpeg-0.4.18" >&5
e.g. --with-ffmpeg=/usr/local" >&5
echo "$as_me: WARNING: You can call configure with the --with-ffmpeg option.
This tells configure where to find the ffmpeg build directory within which are the libavcodec
and libavformat files that can be used to build true MPEG streaming into ZoneMinder. A normal
install of ffmpeg only installs the applications and not the libraries or headers necessary
to link to so this will probably be a local or temporary directory.
e.g. --with-ffmpeg=/home/ffmpeg-0.4.18" >&2;}
e.g. --with-ffmpeg=/usr/local" >&2;}
fi;
@ -1729,7 +1729,7 @@ FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include"
LDFLAGS="${FFMPEG_LIBS} $LDFLAGS"
LAME_PREFIX=
# Ask group for lame path:.
# Ask for lame path:.
# Check whether --with-lame or --without-lame was given.
if test "${with_lame+set}" = set; then
@ -5000,8 +5000,8 @@ _ACEOF
LIBS="-lmp3lame $LIBS"
else
{ echo "$as_me:$LINENO: WARNING: libmp3lame.a may be required for IE compatible MPEG streaming" >&5
echo "$as_me: WARNING: libmp3lame.a may be required for IE compatible MPEG streaming" >&2;}
{ echo "$as_me:$LINENO: WARNING: libmp3lame.a may be required if ffmpeg was built with it" >&5
echo "$as_me: WARNING: libmp3lame.a may be required if ffmpeg was built with it" >&2;}
fi

8
configure.in
View File

@ -18,7 +18,7 @@ AC_SUBST(MYSQL_CFLAGS)
LDFLAGS="${MYSQL_LIBS} $LDFLAGS"
FFMPEG_PREFIX=
# Ask group for ffmpeg:.
# Ask for ffmpeg path:.
AC_ARG_WITH(ffmpeg,
[ --with-ffmpeg=<path> prefix of ffmpeg build directory for libavcodec etc],
[FFMPEG_PREFIX=$with_ffmpeg],
@ -27,7 +27,7 @@ AC_ARG_WITH(ffmpeg,
and libavformat files that can be used to build true MPEG streaming into ZoneMinder. A normal
install of ffmpeg only installs the applications and not the libraries or headers necessary
to link to so this will probably be a local or temporary directory.
e.g. --with-ffmpeg=/home/ffmpeg-0.4.18])
e.g. --with-ffmpeg=/usr/local])
)
AC_SUBST(FFMPEG_PREFIX)
FFMPEG_LIBS="-L${FFMPEG_PREFIX}/lib"
@ -38,7 +38,7 @@ AC_SUBST(FFMPEG_CFLAGS)
LDFLAGS="${FFMPEG_LIBS} $LDFLAGS"
LAME_PREFIX=
# Ask group for lame path:.
# Ask for lame path:.
AC_ARG_WITH(lame,
[ --with-lame=<path> prefix of lame library directory for libmp3lame],
[LAME_PREFIX=$with_lame],
@ -121,7 +121,7 @@ AC_CHECK_LIB(mysqlclient,mysql_init,,AC_MSG_ERROR(zm requires libmysqlclient.a))
AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a is required for remote/network camera support))
AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming),-lavcodec)
AC_CHECK_LIB(mp3lame,lame_init,,AC_MSG_WARN(libmp3lame.a may be required for IE compatible MPEG streaming))
AC_CHECK_LIB(mp3lame,lame_init,,AC_MSG_WARN(libmp3lame.a may be required if ffmpeg was built with it))
AC_SUBST(XLIBS)