libaacs | branch: master | npzacs <npz...@gmail.com> | Tue Feb 17 12:45:57 2015 +0200| [a598e352b273f2e66fbef172fd157740bf28837b] | committer: npzacs
configure.ac: pthread not required with gcrypt >= 1.6.0 > http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=a598e352b273f2e66fbef172fd157740bf28837b --- configure.ac | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 0eedb95..09dca28 100644 --- a/configure.ac +++ b/configure.ac @@ -109,16 +109,20 @@ AC_CHECK_FUNC([snprintf],, [AC_MSG_ERROR($function_not_found)]) dnl required libraries -dnl pthread check (not on win32) -AS_IF([test "${SYS}" != "mingw32"], [ - AC_CHECK_HEADERS([pthread.h], , - [AC_MSG_ERROR([pthread required])]) - AC_SEARCH_LIBS([pthread_create], [pthread], , - [AC_MSG_ERROR([pthread required])]) -]) - dnl gcrypt check -AM_PATH_LIBGCRYPT([1.1.94],, AC_MSG_ERROR([libgcrypt not found on system])) +AM_PATH_LIBGCRYPT([1.6.0], [have_gcrypt=yes]) +AS_IF([test "x$have_gcrypt" != xyes],[ + dnl older gcrypt requires pthread + AM_PATH_LIBGCRYPT([1.1.94],, + AC_MSG_ERROR([libgcrypt not found on system])) + dnl pthread check (not on win32) + AS_IF([test "${SYS}" != "mingw32"], [ + AC_CHECK_HEADERS([pthread.h], , + [AC_MSG_ERROR([pthread required])]) + AC_SEARCH_LIBS([pthread_create], [pthread], , + [AC_MSG_ERROR([pthread required])]) + ]) + ]) dnl use re-entrant version of gcrypt_error() from gpg-error AC_FUNC_STRERROR_R _______________________________________________ libaacs-devel mailing list libaacs-devel@videolan.org https://mailman.videolan.org/listinfo/libaacs-devel