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 gpg-error recipe for gpg-error.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/gpg-error.m4 |
| 9 | =================================================================== |
| 10 | --- pinentry-1.0.0.orig/m4/gpg-error.m4 |
| 11 | +++ pinentry-1.0.0/m4/gpg-error.m4 |
| 12 | @@ -25,74 +25,12 @@ dnl config script does not match the hos |
| 13 | dnl is added to the gpg_config_script_warn variable. |
| 14 | dnl |
| 15 | AC_DEFUN([AM_PATH_GPG_ERROR], |
| 16 | -[ AC_REQUIRE([AC_CANONICAL_HOST]) |
| 17 | - gpg_error_config_prefix="" |
| 18 | - dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, |
| 19 | - dnl since that is consistent with how our three siblings use the directory/ |
| 20 | - dnl package name in --with-$dir_name-prefix=PFX. |
| 21 | - AC_ARG_WITH(libgpg-error-prefix, |
| 22 | - AC_HELP_STRING([--with-libgpg-error-prefix=PFX], |
| 23 | - [prefix where GPG Error is installed (optional)]), |
| 24 | - [gpg_error_config_prefix="$withval"]) |
| 25 | - |
| 26 | - dnl Accept --with-gpg-error-prefix and make it work the same as |
| 27 | - dnl --with-libgpg-error-prefix above, for backwards compatibility, |
| 28 | - dnl but do not document this old, inconsistently-named option. |
| 29 | - AC_ARG_WITH(gpg-error-prefix,, |
| 30 | - [gpg_error_config_prefix="$withval"]) |
| 31 | - |
| 32 | - if test x"${GPG_ERROR_CONFIG}" = x ; then |
| 33 | - if test x"${gpg_error_config_prefix}" != x ; then |
| 34 | - GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" |
| 35 | - else |
| 36 | - case "${SYSROOT}" in |
| 37 | - /*) |
| 38 | - if test -x "${SYSROOT}/bin/gpg-error-config" ; then |
| 39 | - GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" |
| 40 | - fi |
| 41 | - ;; |
| 42 | - '') |
| 43 | - ;; |
| 44 | - *) |
| 45 | - AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) |
| 46 | - ;; |
| 47 | - esac |
| 48 | - fi |
| 49 | - fi |
| 50 | - |
| 51 | - AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) |
| 52 | +[ |
| 53 | min_gpg_error_version=ifelse([$1], ,0.0,$1) |
| 54 | - AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) |
| 55 | - ok=no |
| 56 | - if test "$GPG_ERROR_CONFIG" != "no" \ |
| 57 | - && test -f "$GPG_ERROR_CONFIG" ; then |
| 58 | - req_major=`echo $min_gpg_error_version | \ |
| 59 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
| 60 | - req_minor=`echo $min_gpg_error_version | \ |
| 61 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
| 62 | - gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version` |
| 63 | - major=`echo $gpg_error_config_version | \ |
| 64 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
| 65 | - minor=`echo $gpg_error_config_version | \ |
| 66 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` |
| 67 | - if test "$major" -gt "$req_major"; then |
| 68 | - ok=yes |
| 69 | - else |
| 70 | - if test "$major" -eq "$req_major"; then |
| 71 | - if test "$minor" -ge "$req_minor"; then |
| 72 | - ok=yes |
| 73 | - fi |
| 74 | - fi |
| 75 | - fi |
| 76 | - fi |
| 77 | + PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version gpg-error], [ok=yes], [ok=no]) |
| 78 | if test $ok = yes; then |
| 79 | - GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` |
| 80 | - GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` |
| 81 | - GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` |
| 82 | - GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` |
| 83 | - AC_MSG_RESULT([yes ($gpg_error_config_version)]) |
| 84 | ifelse([$2], , :, [$2]) |
| 85 | - gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` |
| 86 | + gpg_error_config_host=`$PKG_CONFIG --host gpg-error 2>/dev/null || echo none` |
| 87 | if test x"$gpg_error_config_host" != xnone ; then |
| 88 | if test x"$gpg_error_config_host" != x"$host" ; then |
| 89 | AC_MSG_WARN([[ |
| 90 | @@ -107,10 +45,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], |
| 91 | fi |
| 92 | fi |
| 93 | else |
| 94 | - GPG_ERROR_CFLAGS="" |
| 95 | - GPG_ERROR_LIBS="" |
| 96 | - GPG_ERROR_MT_CFLAGS="" |
| 97 | - GPG_ERROR_MT_LIBS="" |
| 98 | AC_MSG_RESULT(no) |
| 99 | ifelse([$3], , :, [$3]) |
| 100 | fi |