[FFmpeg-cvslog] configure: Use libgcrypt-config's cflags

Ricardo Constantino git at videolan.org
Sat Jan 9 01:02:30 CET 2016


ffmpeg | branch: master | Ricardo Constantino <wiiaboo at gmail.com> | Fri Jan  8 23:40:50 2016 +0000| [be0f005da639a36147a25426a8663b0c7339062d] | committer: James Almer

configure: Use libgcrypt-config's cflags

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be0f005da639a36147a25426a8663b0c7339062d
---

 configure |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 7cc0119..19898be 100755
--- a/configure
+++ b/configure
@@ -5578,8 +5578,11 @@ fi
 if enabled gcrypt; then
     GCRYPT_CONFIG="${cross_prefix}libgcrypt-config"
     if "${GCRYPT_CONFIG}" --version > /dev/null 2>&1; then
+        gcrypt_cflags=$("${GCRYPT_CONFIG}" --cflags)
         gcrypt_libs=$("${GCRYPT_CONFIG}" --libs)
-        require2 gcrypt gcrypt.h gcry_mpi_new $gcrypt_libs
+        check_func_headers gcrypt.h gcry_mpi_new $gcrypt_cflags $gcrypt_libs ||
+            die "ERROR: gcrypt not found"
+        add_cflags $gcrypt_cflags && add_extralibs $gcrypt_libs
     else
         require2 gcrypt gcrypt.h gcry_mpi_new -lgcrypt
     fi



More information about the ffmpeg-cvslog mailing list