| From e36cbf9d7a32de9945a8b6c62ad29dfb60358081 Mon Sep 17 00:00:00 2001 |
| From: "Anu Deepthika, Nandipati" <Nandipati.AnuDeepthika@philips.com> |
| Date: Wed, 9 Mar 2022 02:03:51 +0530 |
| Subject: [PATCH] Add and use pkgconfig instead of libgcrypt-config |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Anu Deepthika, Nandipati <Nandipati.AnuDeepthika@philips.com> |
| --- |
| m4/libgcrypt.m4 | 56 ++----------------------------------------------- |
| 1 file changed, 2 insertions(+), 54 deletions(-) |
| |
| diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 |
| index 9a29eb5..465fe24 100644 |
| --- a/m4/libgcrypt.m4 |
| +++ b/m4/libgcrypt.m4 |
| @@ -22,17 +22,7 @@ dnl with a changed API. |
| dnl |
| AC_DEFUN([AM_PATH_LIBGCRYPT], |
| [ AC_REQUIRE([AC_CANONICAL_HOST]) |
| - AC_ARG_WITH(libgcrypt-prefix, |
| - AS_HELP_STRING([--with-libgcrypt-prefix=PFX], |
| - [prefix where LIBGCRYPT is installed (optional)]), |
| - libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") |
| - if test x$libgcrypt_config_prefix != x ; then |
| - if test x${LIBGCRYPT_CONFIG+set} != xset ; then |
| - LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config |
| - fi |
| - fi |
| |
| - AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) |
| tmp=ifelse([$1], ,1:1.2.0,$1) |
| if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then |
| req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` |
| @@ -41,44 +31,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], |
| req_libgcrypt_api=0 |
| min_libgcrypt_version="$tmp" |
| fi |
| + PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= $min_libgcrypt_version], [ok=yes], [ok=no]) |
| |
| - AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) |
| - ok=no |
| - if test "$LIBGCRYPT_CONFIG" != "no" ; then |
| - req_major=`echo $min_libgcrypt_version | \ |
| - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
| - req_minor=`echo $min_libgcrypt_version | \ |
| - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
| - req_micro=`echo $min_libgcrypt_version | \ |
| - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
| - libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` |
| - major=`echo $libgcrypt_config_version | \ |
| - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
| - minor=`echo $libgcrypt_config_version | \ |
| - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` |
| - micro=`echo $libgcrypt_config_version | \ |
| - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` |
| - if test "$major" -gt "$req_major"; then |
| - ok=yes |
| - else |
| - if test "$major" -eq "$req_major"; then |
| - if test "$minor" -gt "$req_minor"; then |
| - ok=yes |
| - else |
| - if test "$minor" -eq "$req_minor"; then |
| - if test "$micro" -ge "$req_micro"; then |
| - ok=yes |
| - fi |
| - fi |
| - fi |
| - fi |
| - fi |
| - fi |
| - if test $ok = yes; then |
| - AC_MSG_RESULT([yes ($libgcrypt_config_version)]) |
| - else |
| - AC_MSG_RESULT(no) |
| - fi |
| if test $ok = yes; then |
| # If we have a recent libgcrypt, we should also check that the |
| # API is compatible |
| @@ -96,10 +50,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], |
| fi |
| fi |
| if test $ok = yes; then |
| - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` |
| - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` |
| ifelse([$2], , :, [$2]) |
| - libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` |
| + libgcrypt_config_host=`$PKG_CONFIG --variable=host libgcrypt` |
| if test x"$libgcrypt_config_host" != xnone ; then |
| if test x"$libgcrypt_config_host" != x"$host" ; then |
| AC_MSG_WARN([[ |
| @@ -112,10 +64,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], |
| ***]]) |
| fi |
| fi |
| - else |
| - LIBGCRYPT_CFLAGS="" |
| - LIBGCRYPT_LIBS="" |
| - ifelse([$3], , :, [$3]) |
| fi |
| AC_SUBST(LIBGCRYPT_CFLAGS) |
| AC_SUBST(LIBGCRYPT_LIBS) |
| -- |
| 2.25.1 |
| |