libaacs | branch: master | npzacs <[email protected]> | Thu Dec 8 11:58:17 2011 +0200| [9102ffc36fea70464b9cbecbcdc3ff8d4befaf71] | committer: npzacs
Properly link against libgpg-error when it is used > http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=9102ffc36fea70464b9cbecbcdc3ff8d4befaf71 --- ChangeLog | 1 + configure.ac | 1 + src/libaacs/crypto.c | 2 +- 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e78e078..6bc1050 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ ????-??-??: + - Check for libgpg-error. Link against it when needed. - Distribute README.txt - Added ChangeLog diff --git a/configure.ac b/configure.ac index 44d8b4a..ed960fc 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,7 @@ else AC_SUBST(LIBGCRYPT_LIBS) fi AC_FUNC_STRERROR_R +AC_CHECK_LIB([gpg-error], [gpg_strerror_r]) # function testing for supported compiler options check_cc_options() diff --git a/src/libaacs/crypto.c b/src/libaacs/crypto.c index 0375c21..fc94f1f 100644 --- a/src/libaacs/crypto.c +++ b/src/libaacs/crypto.c @@ -151,7 +151,7 @@ void crypto_aesg3(const uint8_t *D, uint8_t *lsubk, uint8_t* rsubk, uint8_t *pk) } } -#ifdef HAVE_STRERROR_R +#if defined(HAVE_STRERROR_R) && defined(HAVE_LIBGPG_ERROR) #define LOG_GCRY_ERROR(msg, func, err) \ char errstr[100] = {0}; \ gpg_strerror_r(err, errstr, sizeof(errstr)); \ _______________________________________________ libaacs-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libaacs-devel
