Bug 76 - Now supports CVS ffmpeg

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1498 e3e1d417-86f3-4887-817a-d78f3d33393f
pull/27/merge
stan 2005-10-03 20:39:14 +00:00
parent 209f65e10f
commit f1c76030a9
2 changed files with 18 additions and 11 deletions

View File

@ -20,6 +20,9 @@
/* Define to 1 if you have the `avformat' library (-lavformat). */
#undef HAVE_LIBAVFORMAT
/* Define to 1 if you have the `avutil' library (-lavutil). */
#undef HAVE_LIBAVUTIL
/* Define to 1 if you have the `crypto' library (-lcrypto). */
#undef HAVE_LIBCRYPTO

View File

@ -1,10 +1,11 @@
AC_INIT(src/zm.h)
AM_INIT_AUTOMAKE(zm,1.21.3)
AM_INIT_AUTOMAKE(zm,1.21.4)
AM_CONFIG_HEADER(config.h)
PATH_BUILD=`pwd`
AC_SUBST(PATH_BUILD)
MYSQL_PREFIX=/usr
AC_ARG_WITH(mysql,
[ --with-mysql=<path> prefix of MySQL installation. e.g. /usr/local or /usr],
[MYSQL_PREFIX=$with_mysql],
@ -20,16 +21,17 @@ AC_SUBST(MYSQL_CFLAGS)
LDFLAGS="${MYSQL_LIBS} $LDFLAGS"
FFMPEG_PREFIX=
FFMPEG_PREFIX=/usr
# Ask for ffmpeg path:.
AC_ARG_WITH(ffmpeg,
[ --with-ffmpeg=<path> prefix of ffmpeg build directory for libavcodec etc],
[ --with-ffmpeg=<path> prefix of ffmpeg root directory for libavcodec etc],
[FFMPEG_PREFIX=$with_ffmpeg],
AC_MSG_WARN([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.
This tells configure where to find the ffmpeg root directory within which are the libavcodec
and libavformat files that can be used to build true MPEG streaming into ZoneMinder. Ensure that
your copy of ffmpeg has installed libraries as well as binaries (use 'make installlib'). If you
are using a local install of ffmpeg you may have to remove or rename a previous real installation
as the headers and libraries from that will probably be picked up before your local copy.
e.g. --with-ffmpeg=/usr/local])
)
AC_SUBST(FFMPEG_PREFIX)
@ -40,16 +42,16 @@ AC_SUBST(FFMPEG_CFLAGS)
LDFLAGS="${FFMPEG_LIBS} $LDFLAGS"
LAME_PREFIX=
LAME_PREFIX=/usr
# Ask for lame path:.
AC_ARG_WITH(lame,
[ --with-lame=<path> prefix of lame library directory for libmp3lame],
[LAME_PREFIX=$with_lame],
AC_MSG_WARN([You can call configure with the --with-lame option.
This tells configure where to find the Lame library which can be used by the ffmpeg libraries
to generate IE compatible MPEG audio streams. This option is only necessary if you have built
the ffmpeg package itself with the --enable-mp3lame option and if the normal link cannot
find the library. Using mp3lame is not necessary or of any benefit to ZoneMinder per se.
to generate IE compatible MPEG audio streams. This option is only necessary if you have built
the ffmpeg package itself with the --enable-mp3lame option and if the normal link cannot
find the library. Using mp3lame is not necessary or of any benefit to ZoneMinder per se.
e.g. --with-lame=/use/local/lib])
)
AC_SUBST(LAME_PREFIX)
@ -112,6 +114,7 @@ AC_HEADER_STDC
AC_LANG_CPLUSPLUS
XLIBS=""
AC_SUBST(LDFLAGS)
AC_CHECK_HEADERS(pcre/pcre.h,,,)
AC_CHECK_HEADERS(pcre.h,,,)
@ -124,6 +127,7 @@ AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
AC_CHECK_LIB(mysqlclient,mysql_init,,AC_MSG_ERROR(zm requires libmysqlclient.a))
AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN(libcrypto.a is required for authenticated streaming))
AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for some remote/network camera support))
AC_CHECK_LIB(avutil,ff_gcd,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
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 if ffmpeg was built with it))