From 9a5b503da5a52b7b4fb05ba4cb56681f7d1a7b0f Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Fri, 11 Mar 2016 12:28:21 -0800
Subject: [PATCH] GUAC-236: Add libavutil to build.

---
 configure.ac            | 24 +++++++++++++++++++++++-
 src/guacenc/Makefile.am |  2 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b30db0a7..a64b9cb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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}
diff --git a/src/guacenc/Makefile.am b/src/guacenc/Makefile.am
index e42a8401..3f4ac424 100644
--- a/src/guacenc/Makefile.am
+++ b/src/guacenc/Makefile.am
@@ -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@