Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | Convert to pkg-config support to match changes done to |
| 2 | the libassuan recipe for libassuan.pc generation. |
| 3 | |
| 4 | Upstream-Status: Inappropriate [OE specific] |
| 5 | |
| 6 | Signed-off-by: Armin Kuster <akuster@mvista.com> |
| 7 | |
| 8 | Index: pinentry-1.0.0/m4/libassuan.m4 |
| 9 | =================================================================== |
| 10 | --- pinentry-1.0.0.orig/m4/libassuan.m4 |
| 11 | +++ pinentry-1.0.0/m4/libassuan.m4 |
| 12 | @@ -13,34 +13,8 @@ dnl |
| 13 | dnl Common code used for libassuan detection [internal] |
| 14 | dnl Returns ok set to yes or no. |
| 15 | dnl |
| 16 | -AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
| 17 | -[ AC_REQUIRE([AC_CANONICAL_HOST]) |
| 18 | - AC_ARG_WITH(libassuan-prefix, |
| 19 | - AC_HELP_STRING([--with-libassuan-prefix=PFX], |
| 20 | - [prefix where LIBASSUAN is installed (optional)]), |
| 21 | - libassuan_config_prefix="$withval", libassuan_config_prefix="") |
| 22 | - if test x$libassuan_config_prefix != x ; then |
| 23 | - libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix" |
| 24 | - if test x${LIBASSUAN_CONFIG+set} != xset ; then |
| 25 | - LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config |
| 26 | - fi |
| 27 | - else |
| 28 | - case "${SYSROOT}" in |
| 29 | - /*) |
| 30 | - if test -x "${SYSROOT}/bin/libassuan-config" ; then |
| 31 | - LIBASSUAN_CONFIG="${SYSROOT}/bin/libassuan-config" |
| 32 | - fi |
| 33 | - ;; |
| 34 | - '') |
| 35 | - ;; |
| 36 | - *) |
| 37 | - AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) |
| 38 | - ;; |
| 39 | - esac |
| 40 | - fi |
| 41 | - |
| 42 | - AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no) |
| 43 | - |
| 44 | +AC_DEFUN([AM_PATH_LIBASSUAN_COMMON], |
| 45 | +[ |
| 46 | tmp=ifelse([$1], ,1:0.9.2,$1) |
| 47 | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then |
| 48 | req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` |
| 49 | @@ -50,51 +24,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
| 50 | min_libassuan_version="$tmp" |
| 51 | fi |
| 52 | |
| 53 | - AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) |
| 54 | - ok=no |
| 55 | - if test "$LIBASSUAN_CONFIG" != "no" \ |
| 56 | - && test -f "$LIBASSUAN_CONFIG" ; then |
| 57 | - req_major=`echo $min_libassuan_version | \ |
| 58 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
| 59 | - req_minor=`echo $min_libassuan_version | \ |
| 60 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
| 61 | - req_micro=`echo $min_libassuan_version | \ |
| 62 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
| 63 | - |
| 64 | - libassuan_config_version=`$LIBASSUAN_CONFIG --version` |
| 65 | - major=`echo $libassuan_config_version | \ |
| 66 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
| 67 | - minor=`echo $libassuan_config_version | \ |
| 68 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` |
| 69 | - micro=`echo $libassuan_config_version | \ |
| 70 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` |
| 71 | - |
| 72 | - if test "$major" -gt "$req_major"; then |
| 73 | - ok=yes |
| 74 | - else |
| 75 | - if test "$major" -eq "$req_major"; then |
| 76 | - if test "$minor" -gt "$req_minor"; then |
| 77 | - ok=yes |
| 78 | - else |
| 79 | - if test "$minor" -eq "$req_minor"; then |
| 80 | - if test "$micro" -ge "$req_micro"; then |
| 81 | - ok=yes |
| 82 | - fi |
| 83 | - fi |
| 84 | - fi |
| 85 | - fi |
| 86 | - fi |
| 87 | - fi |
| 88 | - |
| 89 | - if test $ok = yes; then |
| 90 | - AC_MSG_RESULT([yes ($libassuan_config_version)]) |
| 91 | - else |
| 92 | - AC_MSG_RESULT(no) |
| 93 | - fi |
| 94 | + PKG_CHECK_MODULES(LIBASSUAN_COMMON, [libassuan >= $min_libassuan_version libassuan], [ok=yes], [ok=no]) |
| 95 | |
| 96 | if test $ok = yes; then |
| 97 | if test "$req_libassuan_api" -gt 0 ; then |
| 98 | - tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` |
| 99 | + tmp=`$PKG_CONFIG --variable=api_version libassuan 2>/dev/null || echo 0` |
| 100 | if test "$tmp" -gt 0 ; then |
| 101 | AC_MSG_CHECKING([LIBASSUAN API version]) |
| 102 | if test "$req_libassuan_api" -eq "$tmp" ; then |
| 103 | @@ -109,7 +43,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
| 104 | |
| 105 | if test $ok = yes; then |
| 106 | if test x"$host" != x ; then |
| 107 | - libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none` |
| 108 | + libassuan_config_host=`$PKG_CONFIG --host libassuan 2>/dev/null || echo 0` |
| 109 | if test x"$libassuan_config_host" != xnone ; then |
| 110 | if test x"$libassuan_config_host" != x"$host" ; then |
| 111 | AC_MSG_WARN([[ |
| 112 | @@ -132,7 +66,7 @@ dnl Test whether libassuan has at least |
| 113 | dnl used to test for features only available in newer versions. |
| 114 | dnl |
| 115 | AC_DEFUN([AM_CHECK_LIBASSUAN], |
| 116 | -[ _AM_PATH_LIBASSUAN_COMMON($1) |
| 117 | +[ AM_PATH_LIBASSUAN_COMMON($1) |
| 118 | if test $ok = yes; then |
| 119 | ifelse([$2], , :, [$2]) |
| 120 | else |
| 121 | @@ -148,16 +82,10 @@ dnl [ACTION-IF-FOUND [ |
| 122 | dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS |
| 123 | dnl |
| 124 | AC_DEFUN([AM_PATH_LIBASSUAN], |
| 125 | -[ _AM_PATH_LIBASSUAN_COMMON($1) |
| 126 | +[ AM_PATH_LIBASSUAN_COMMON($1) |
| 127 | if test $ok = yes; then |
| 128 | - LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags` |
| 129 | - LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs` |
| 130 | ifelse([$2], , :, [$2]) |
| 131 | else |
| 132 | - LIBASSUAN_CFLAGS="" |
| 133 | - LIBASSUAN_LIBS="" |
| 134 | ifelse([$3], , :, [$3]) |
| 135 | fi |
| 136 | - AC_SUBST(LIBASSUAN_CFLAGS) |
| 137 | - AC_SUBST(LIBASSUAN_LIBS) |
| 138 | ]) |
| 139 | Index: pinentry-1.0.0/configure.ac |
| 140 | =================================================================== |
| 141 | --- pinentry-1.0.0.orig/configure.ac |
| 142 | +++ pinentry-1.0.0/configure.ac |
| 143 | @@ -266,8 +266,8 @@ if test "$have_libassuan" = "yes"; then |
| 144 | [version of the libassuan library]) |
| 145 | fi |
| 146 | |
| 147 | -COMMON_CFLAGS="$LIBASSUAN_CFLAGS $COMMON_CFLAGS" |
| 148 | -COMMON_LIBS="$LIBASSUAN_LIBS $COMMON_LIBS" |
| 149 | +COMMON_CFLAGS="$LIBASSUAN_COMMON_CFLAGS $COMMON_CFLAGS" |
| 150 | +COMMON_LIBS="$LIBASSUAN_COMMON_LIBS $COMMON_LIBS" |
| 151 | |
| 152 | |
| 153 | dnl Checks for libsecmem. |