Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Add pkgconfig support to libassuan. |
| 2 | This patch is rejected by upstream for the reason below: |
| 3 | They think pkgconfig adds no portability and maintaining them is not worthwhile. |
| 4 | |
| 5 | Upstream-Status: Denied |
| 6 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 7 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> |
| 8 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 9 | forward ported to 2.4.4 |
| 10 | Signed-off-by: Armin Kuster <akuster@mvista.com> |
| 11 | |
| 12 | Index: libassuan-2.4.4/libassuan.pc.in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 13 | =================================================================== |
| 14 | --- /dev/null |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 15 | +++ libassuan-2.4.4/libassuan.pc.in |
| 16 | @@ -0,0 +1,13 @@ |
| 17 | +prefix=@exec_prefix@ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18 | +libdir=@libdir@ |
| 19 | +includedir=@includedir@ |
| 20 | +api_version=@LIBASSUAN_CONFIG_API_VERSION@ |
| 21 | +host=@LIBASSUAN_CONFIG_HOST@ |
| 22 | + |
| 23 | +Name: libassuan |
| 24 | +Description: IPC library used by GnuPG and GPGME |
| 25 | +Requires: |
| 26 | +Version: @VERSION@ |
| 27 | +Libs: -L${libdir} -lassuan |
| 28 | +Libs.private: -lgpg-error |
| 29 | +Cflags: -I${includedir} |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 30 | Index: libassuan-2.4.4/Makefile.am |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 31 | =================================================================== |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 32 | --- a/Makefile.am |
| 33 | +++ b/Makefile.am |
| 34 | @@ -25,10 +25,13 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-doc |
| 35 | # (A suitable gitlog-to-changelog script can be found in GnuPG master.) |
| 36 | GITLOG_TO_CHANGELOG=gitlog-to-changelog |
| 37 | |
| 38 | +pkgconfigdir = $(libdir)/pkgconfig |
| 39 | +pkgconfig_DATA = libassuan.pc |
| 40 | + |
| 41 | EXTRA_DIST = autogen.sh autogen.rc README.GIT VERSION \ |
| 42 | ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \ |
| 43 | tests/ChangeLog-2011 contrib/ChangeLog-2011 \ |
| 44 | - build-aux/git-log-footer build-aux/git-log-fix |
| 45 | + build-aux/git-log-footer build-aux/git-log-fix libassuan.pc.in |
| 46 | |
| 47 | if BUILD_DOC |
| 48 | doc = doc |
| 49 | Index: 2.4.4-r0/libassuan-2.4.4/configure.ac |
| 50 | =================================================================== |
| 51 | --- a/configure.ac |
| 52 | +++ b/configure.ac |
| 53 | @@ -485,6 +485,7 @@ AC_CONFIG_FILES([doc/Makefile]) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 54 | AC_CONFIG_FILES([tests/Makefile]) |
| 55 | AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config]) |
| 56 | AC_CONFIG_FILES([src/versioninfo.rc]) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 57 | +AC_CONFIG_FILES([libassuan.pc]) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 58 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 59 | AC_OUTPUT |
| 60 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 61 | Index: libassuan-2.4.4/src/libassuan.m4 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 62 | =================================================================== |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 63 | --- a/src/libassuan.m4 |
| 64 | +++ b/src/libassuan.m4 |
| 65 | @@ -16,18 +16,6 @@ dnl Returns ok set to yes or no. |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 66 | dnl |
| 67 | AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
| 68 | [ AC_REQUIRE([AC_CANONICAL_HOST]) |
| 69 | - AC_ARG_WITH(libassuan-prefix, |
| 70 | - AC_HELP_STRING([--with-libassuan-prefix=PFX], |
| 71 | - [prefix where LIBASSUAN is installed (optional)]), |
| 72 | - libassuan_config_prefix="$withval", libassuan_config_prefix="") |
| 73 | - if test x$libassuan_config_prefix != x ; then |
| 74 | - libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix" |
| 75 | - if test x${LIBASSUAN_CONFIG+set} != xset ; then |
| 76 | - LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config |
| 77 | - fi |
| 78 | - fi |
| 79 | - |
| 80 | - AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no) |
| 81 | |
| 82 | tmp=ifelse([$1], ,1:0.9.2,$1) |
| 83 | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 84 | @@ -38,51 +26,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 85 | min_libassuan_version="$tmp" |
| 86 | fi |
| 87 | |
| 88 | - AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) |
| 89 | - ok=no |
| 90 | - if test "$LIBASSUAN_CONFIG" != "no" \ |
| 91 | - && test -f "$LIBASSUAN_CONFIG" ; then |
| 92 | - req_major=`echo $min_libassuan_version | \ |
| 93 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
| 94 | - req_minor=`echo $min_libassuan_version | \ |
| 95 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
| 96 | - req_micro=`echo $min_libassuan_version | \ |
| 97 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
| 98 | - |
| 99 | - libassuan_config_version=`$LIBASSUAN_CONFIG --version` |
| 100 | - major=`echo $libassuan_config_version | \ |
| 101 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
| 102 | - minor=`echo $libassuan_config_version | \ |
| 103 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` |
| 104 | - micro=`echo $libassuan_config_version | \ |
| 105 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` |
| 106 | - |
| 107 | - if test "$major" -gt "$req_major"; then |
| 108 | - ok=yes |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 109 | - else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 110 | - if test "$major" -eq "$req_major"; then |
| 111 | - if test "$minor" -gt "$req_minor"; then |
| 112 | - ok=yes |
| 113 | - else |
| 114 | - if test "$minor" -eq "$req_minor"; then |
| 115 | - if test "$micro" -ge "$req_micro"; then |
| 116 | - ok=yes |
| 117 | - fi |
| 118 | - fi |
| 119 | - fi |
| 120 | - fi |
| 121 | - fi |
| 122 | - fi |
| 123 | - |
| 124 | - if test $ok = yes; then |
| 125 | - AC_MSG_RESULT([yes ($libassuan_config_version)]) |
| 126 | - else |
| 127 | - AC_MSG_RESULT(no) |
| 128 | - fi |
| 129 | + PKG_CHECK_MODULES(LIBASSUAN, [libassuan >= $min_libassuan_version], [ok=yes], [ok=no]) |
| 130 | |
| 131 | if test $ok = yes; then |
| 132 | if test "$req_libassuan_api" -gt 0 ; then |
| 133 | tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` |
| 134 | + tmp=`$PKG_CONFIG --variable=api_version libassuan` |
| 135 | if test "$tmp" -gt 0 ; then |
| 136 | AC_MSG_CHECKING([LIBASSUAN API version]) |
| 137 | if test "$req_libassuan_api" -eq "$tmp" ; then |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 138 | @@ -97,7 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 139 | |
| 140 | if test $ok = yes; then |
| 141 | if test x"$host" != x ; then |
| 142 | - libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none` |
| 143 | + libassuan_config_host=`$PKG_CONFIG --variable=host libassuan` |
| 144 | if test x"$libassuan_config_host" != xnone ; then |
| 145 | if test x"$libassuan_config_host" != x"$host" ; then |
| 146 | AC_MSG_WARN([[ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 147 | @@ -138,12 +87,8 @@ dnl |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 148 | AC_DEFUN([AM_PATH_LIBASSUAN], |
| 149 | [ _AM_PATH_LIBASSUAN_COMMON($1) |
| 150 | if test $ok = yes; then |
| 151 | - LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags` |
| 152 | - LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs` |
| 153 | ifelse([$2], , :, [$2]) |
| 154 | else |
| 155 | - LIBASSUAN_CFLAGS="" |
| 156 | - LIBASSUAN_LIBS="" |
| 157 | ifelse([$3], , :, [$3]) |
| 158 | fi |
| 159 | AC_SUBST(LIBASSUAN_CFLAGS) |