GUAC-236: Add libavutil to build.

This commit is contained in:
Michael Jumper 2016-03-11 12:28:21 -08:00
parent 17df235c4e
commit 9a5b503da5
2 changed files with 25 additions and 1 deletions

View File

@ -165,6 +165,26 @@ fi
AM_CONDITIONAL([ENABLE_AVCODEC], [test "x${have_libavcodec}" = "xyes"])
#
# libavutil
#
have_libavutil=disabled
AC_ARG_WITH([libavutil],
[AS_HELP_STRING([--with-libavutil],
[use libavutil when encoding video @<:@default=check@:>@])],
[],
[with_libavutil=check])
if test "x$with_libavutil" != "xno"
then
have_libavutil=yes
PKG_CHECK_MODULES([AVUTIL], [libavutil],, [have_libavutil=no]);
fi
AM_CONDITIONAL([ENABLE_AVUTIL], [test "x${have_libavutil}" = "xyes"])
#
# libssl
#
@ -1008,7 +1028,8 @@ AC_ARG_ENABLE([guacenc],
[enable_guacenc=yes])
AM_CONDITIONAL([ENABLE_GUACENC], [test "x${enable_guacenc}" = "xyes" \
-a "x${have_libavcodec}" = "xyes"])
-a "x${have_libavcodec}" = "xyes" \
-a "x${have_libavutil}" = "xyes"])
#
# Output Makefiles
@ -1064,6 +1085,7 @@ $PACKAGE_NAME version $PACKAGE_VERSION
freerdp ............. ${have_freerdp}
pango ............... ${have_pango}
libavcodec .......... ${have_libavcodec}
libavutil ........... ${have_libavutil}
libssh2 ............. ${have_libssh2}
libssl .............. ${have_ssl}
libtelnet ........... ${have_libtelnet}

View File

@ -76,6 +76,7 @@ endif
guacenc_CFLAGS = \
-Werror -Wall -pedantic \
@AVCODEC_CFLAGS@ \
@AVUTIL_CFLAGS@ \
@LIBGUAC_INCLUDE@
guacenc_LDADD = \
@ -83,6 +84,7 @@ guacenc_LDADD = \
guacenc_LDFLAGS = \
@AVCODEC_LIBS@ \
@AVUTIL_LIBS@ \
@CAIRO_LIBS@ \
@JPEG_LIBS@ \
@WEBP_LIBS@