| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | use OR PKG_CONFIG scheme for libgcrypt |
| 2 | |
| 3 | Upstream-Status: Inappropriate OE specific |
| 4 | |
| 5 | Signed-off-by: Armin Kuster <akuster808@gmail.com> |
| 6 | |
| 7 | Index: wireshark-2.4.4/m4/libgcrypt.m4 |
| 8 | =================================================================== |
| 9 | --- wireshark-2.4.4.orig/m4/libgcrypt.m4 |
| 10 | +++ wireshark-2.4.4/m4/libgcrypt.m4 |
| 11 | @@ -27,11 +27,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], |
| 12 | libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") |
| 13 | if test x$libgcrypt_config_prefix != x ; then |
| 14 | if test x${LIBGCRYPT_CONFIG+set} != xset ; then |
| 15 | - LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config |
| 16 | + LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/libgcrypt.pc |
| 17 | fi |
| 18 | fi |
| 19 | |
| 20 | - AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) |
| 21 | + AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt.pc, no) |
| 22 | tmp=ifelse([$1], ,1:1.2.0,$1) |
| 23 | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then |
| 24 | req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` |
| 25 | @@ -50,7 +50,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], |
| 26 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
| 27 | req_micro=`echo $min_libgcrypt_version | \ |
| 28 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
| 29 | - libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` |
| 30 | + libgcrypt_config_version=`$PKG_CONFIG --modversion libgcrypt` |
| 31 | major=`echo $libgcrypt_config_version | \ |
| 32 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
| 33 | minor=`echo $libgcrypt_config_version | \ |
| 34 | @@ -82,7 +82,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], |
| 35 | # If we have a recent libgcrypt, we should also check that the |
| 36 | # API is compatible |
| 37 | if test "$req_libgcrypt_api" -gt 0 ; then |
| 38 | - tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` |
| 39 | + tmp=`$PKG_CONFIG --api-version libgcrypt 2>/dev/null || echo 0` |
| 40 | if test "$tmp" -gt 0 ; then |
| 41 | AC_MSG_CHECKING([LIBGCRYPT API version]) |
| 42 | if test "$req_libgcrypt_api" -eq "$tmp" ; then |
| 43 | @@ -95,8 +95,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], |
| 44 | fi |
| 45 | fi |
| 46 | if test $ok = yes; then |
| 47 | - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` |
| 48 | - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` |
| 49 | + LIBGCRYPT_CFLAGS=`$PKG_CONFIG --cflags libgcrypt` |
| 50 | + LIBGCRYPT_LIBS=`$PKG_CONFIG --libs libgcrypt` |
| 51 | ifelse([$2], , :, [$2]) |
| 52 | else |
| 53 | LIBGCRYPT_CFLAGS="" |