mutt stable branch with some hacks
Update gpgme and gpg-error automake checks.
Pull updated autoconf files from the GPGME 1.13.0 release and use
those new macros.
Add a call to AM_PATH_GPG_ERROR() and include $(GPG_ERROR_LIBS) in the
libraries.
Thanks to Eike Rathke for finding the build problem, and for his
patch fixing the issue. I opted for just grabbing the newest autoconf
files from gpgme instead, but his fixed worked great too.
+286
-83
+1
-1
Makefile.am
+1
-1
Makefile.am
···
43
43
nodist_mutt_SOURCES = $(BUILT_SOURCES)
44
44
45
45
mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAP) $(MUTTLIBS) \
46
-
$(INTLLIBS) $(LIBICONV) $(GPGME_LIBS)
46
+
$(INTLLIBS) $(LIBICONV) $(GPGME_LIBS) $(GPG_ERROR_LIBS)
47
47
48
48
mutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
49
49
$(INTLDEPS)
+1
configure.ac
+1
configure.ac
+188
m4/gpg-error.m4
+188
m4/gpg-error.m4
···
1
+
# gpg-error.m4 - autoconf macro to detect libgpg-error.
2
+
# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018 g10 Code GmbH
3
+
#
4
+
# This file is free software; as a special exception the author gives
5
+
# unlimited permission to copy and/or distribute it, with or without
6
+
# modifications, as long as this notice is preserved.
7
+
#
8
+
# This file is distributed in the hope that it will be useful, but
9
+
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
10
+
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
11
+
#
12
+
# Last-changed: 2018-11-02
13
+
14
+
15
+
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
16
+
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
17
+
dnl
18
+
dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS,
19
+
dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are
20
+
dnl used for programs requireing real multi thread support.
21
+
dnl
22
+
dnl If a prefix option is not used, the config script is first
23
+
dnl searched in $SYSROOT/bin and then along $PATH. If the used
24
+
dnl config script does not match the host specification the script
25
+
dnl is added to the gpg_config_script_warn variable.
26
+
dnl
27
+
AC_DEFUN([AM_PATH_GPG_ERROR],
28
+
[ AC_REQUIRE([AC_CANONICAL_HOST])
29
+
gpg_error_config_prefix=""
30
+
dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
31
+
dnl since that is consistent with how our three siblings use the directory/
32
+
dnl package name in --with-$dir_name-prefix=PFX.
33
+
AC_ARG_WITH(libgpg-error-prefix,
34
+
AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
35
+
[prefix where GPG Error is installed (optional)]),
36
+
[gpg_error_config_prefix="$withval"])
37
+
38
+
dnl Accept --with-gpg-error-prefix and make it work the same as
39
+
dnl --with-libgpg-error-prefix above, for backwards compatibility,
40
+
dnl but do not document this old, inconsistently-named option.
41
+
AC_ARG_WITH(gpg-error-prefix,,
42
+
[gpg_error_config_prefix="$withval"])
43
+
44
+
if test x"${GPG_ERROR_CONFIG}" = x ; then
45
+
if test x"${gpg_error_config_prefix}" != x ; then
46
+
GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
47
+
else
48
+
case "${SYSROOT}" in
49
+
/*)
50
+
if test -x "${SYSROOT}/bin/gpg-error-config" ; then
51
+
GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
52
+
fi
53
+
;;
54
+
'')
55
+
;;
56
+
*)
57
+
AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
58
+
;;
59
+
esac
60
+
fi
61
+
fi
62
+
63
+
AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
64
+
min_gpg_error_version=ifelse([$1], ,1.33,$1)
65
+
ok=no
66
+
67
+
if test "$prefix" = NONE ; then
68
+
prefix_option_expanded=/usr/local
69
+
else
70
+
prefix_option_expanded="$prefix"
71
+
fi
72
+
if test "$exec_prefix" = NONE ; then
73
+
exec_prefix_option_expanded=$prefix_option_expanded
74
+
else
75
+
exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix)
76
+
fi
77
+
libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir)
78
+
79
+
if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then
80
+
gpgrt_libdir=$libdir_option_expanded
81
+
else
82
+
if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then
83
+
if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then
84
+
if test -f $possible_libdir/pkgconfig/gpg-error.pc; then
85
+
gpgrt_libdir=$possible_libdir
86
+
fi
87
+
fi
88
+
fi
89
+
fi
90
+
91
+
if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then
92
+
AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
93
+
if test "$GPGRT_CONFIG" = "no"; then
94
+
unset GPGRT_CONFIG
95
+
else
96
+
GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
97
+
if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
98
+
GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
99
+
AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
100
+
gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
101
+
else
102
+
unset GPGRT_CONFIG
103
+
fi
104
+
fi
105
+
else
106
+
gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
107
+
fi
108
+
if test "$GPG_ERROR_CONFIG" != "no"; then
109
+
req_major=`echo $min_gpg_error_version | \
110
+
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
111
+
req_minor=`echo $min_gpg_error_version | \
112
+
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
113
+
major=`echo $gpg_error_config_version | \
114
+
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
115
+
minor=`echo $gpg_error_config_version | \
116
+
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
117
+
if test "$major" -gt "$req_major"; then
118
+
ok=yes
119
+
else
120
+
if test "$major" -eq "$req_major"; then
121
+
if test "$minor" -ge "$req_minor"; then
122
+
ok=yes
123
+
fi
124
+
fi
125
+
fi
126
+
if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then
127
+
if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then
128
+
AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
129
+
if test "$GPGRT_CONFIG" = "no"; then
130
+
unset GPGRT_CONFIG
131
+
else
132
+
GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
133
+
if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
134
+
GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
135
+
AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
136
+
else
137
+
unset GPGRT_CONFIG
138
+
fi
139
+
fi
140
+
fi
141
+
fi
142
+
fi
143
+
AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
144
+
if test $ok = yes; then
145
+
GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
146
+
GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs`
147
+
if test -z "$GPGRT_CONFIG"; then
148
+
GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null`
149
+
GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null`
150
+
else
151
+
GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null`
152
+
GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS"
153
+
GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null`
154
+
GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS"
155
+
fi
156
+
AC_MSG_RESULT([yes ($gpg_error_config_version)])
157
+
ifelse([$2], , :, [$2])
158
+
if test -z "$GPGRT_CONFIG"; then
159
+
gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none`
160
+
else
161
+
gpg_error_config_host=`$GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none`
162
+
fi
163
+
if test x"$gpg_error_config_host" != xnone ; then
164
+
if test x"$gpg_error_config_host" != x"$host" ; then
165
+
AC_MSG_WARN([[
166
+
***
167
+
*** The config script "$GPG_ERROR_CONFIG" was
168
+
*** built for $gpg_error_config_host and thus may not match the
169
+
*** used host $host.
170
+
*** You may want to use the configure option --with-libgpg-error-prefix
171
+
*** to specify a matching config script or use \$SYSROOT.
172
+
***]])
173
+
gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
174
+
fi
175
+
fi
176
+
else
177
+
GPG_ERROR_CFLAGS=""
178
+
GPG_ERROR_LIBS=""
179
+
GPG_ERROR_MT_CFLAGS=""
180
+
GPG_ERROR_MT_LIBS=""
181
+
AC_MSG_RESULT(no)
182
+
ifelse([$3], , :, [$3])
183
+
fi
184
+
AC_SUBST(GPG_ERROR_CFLAGS)
185
+
AC_SUBST(GPG_ERROR_LIBS)
186
+
AC_SUBST(GPG_ERROR_MT_CFLAGS)
187
+
AC_SUBST(GPG_ERROR_MT_LIBS)
188
+
])
+96
-82
m4/gpgme.m4
+96
-82
m4/gpgme.m4
···
1
1
# gpgme.m4 - autoconf macro to detect GPGME.
2
-
# Copyright (C) 2002, 2003, 2004 g10 Code GmbH
2
+
# Copyright (C) 2002, 2003, 2004, 2014, 2018 g10 Code GmbH
3
3
#
4
4
# This file is free software; as a special exception the author gives
5
5
# unlimited permission to copy and/or distribute it, with or without
···
8
8
# This file is distributed in the hope that it will be useful, but
9
9
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
10
10
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
11
+
#
12
+
# Last-changed: 2018-11-12
11
13
12
14
13
15
AC_DEFUN([_AM_PATH_GPGME_CONFIG],
···
15
17
AC_HELP_STRING([--with-gpgme-prefix=PFX],
16
18
[prefix where GPGME is installed (optional)]),
17
19
gpgme_config_prefix="$withval", gpgme_config_prefix="")
18
-
if test "x$gpgme_config_prefix" != x ; then
19
-
GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config"
20
+
if test x"${GPGME_CONFIG}" = x ; then
21
+
if test x"${gpgme_config_prefix}" != x ; then
22
+
GPGME_CONFIG="${gpgme_config_prefix}/bin/gpgme-config"
23
+
else
24
+
case "${SYSROOT}" in
25
+
/*)
26
+
if test -x "${SYSROOT}/bin/gpgme-config" ; then
27
+
GPGME_CONFIG="${SYSROOT}/bin/gpgme-config"
28
+
fi
29
+
;;
30
+
'')
31
+
;;
32
+
*)
33
+
AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
34
+
;;
35
+
esac
36
+
fi
37
+
fi
38
+
39
+
use_gpgrt_config=""
40
+
if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
41
+
if $GPGRT_CONFIG gpgme --exists; then
42
+
GPGME_CONFIG="$GPGRT_CONFIG gpgme"
43
+
AC_MSG_NOTICE([Use gpgrt-config as gpgme-config])
44
+
use_gpgrt_config=yes
45
+
fi
20
46
fi
21
-
AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
47
+
if test -z "$use_gpgrt_config"; then
48
+
AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
49
+
fi
22
50
23
51
if test "$GPGME_CONFIG" != "no" ; then
24
-
gpgme_version=`$GPGME_CONFIG --version`
52
+
if test -z "$use_gpgrt_config"; then
53
+
gpgme_version=`$GPGME_CONFIG --version`
54
+
else
55
+
gpgme_version=`$GPGME_CONFIG --modversion`
56
+
fi
25
57
fi
26
58
gpgme_version_major=`echo $gpgme_version | \
27
59
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
···
31
63
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
32
64
])
33
65
66
+
67
+
AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK],
68
+
[
69
+
if test -z "$use_gpgrt_config"; then
70
+
gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none`
71
+
else
72
+
gpgme_config_host=`$GPGME_CONFIG --variable=host 2>/dev/null || echo none`
73
+
fi
74
+
if test x"$gpgme_config_host" != xnone ; then
75
+
if test x"$gpgme_config_host" != x"$host" ; then
76
+
AC_MSG_WARN([[
77
+
***
78
+
*** The config script "$GPGME_CONFIG" was
79
+
*** built for $gpgme_config_host and thus may not match the
80
+
*** used host $host.
81
+
*** You may want to use the configure option --with-gpgme-prefix
82
+
*** to specify a matching config script or use \$SYSROOT.
83
+
***]])
84
+
gpg_config_script_warn="$gpg_config_script_warn gpgme"
85
+
fi
86
+
fi
87
+
])
88
+
89
+
34
90
dnl AM_PATH_GPGME([MINIMUM-VERSION,
35
91
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
36
92
dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS.
37
93
dnl
94
+
dnl If a prefix option is not used, the config script is first
95
+
dnl searched in $SYSROOT/bin and then along $PATH. If the used
96
+
dnl config script does not match the host specification the script
97
+
dnl is added to the gpg_config_script_warn variable.
98
+
dnl
38
99
AC_DEFUN([AM_PATH_GPGME],
39
100
[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
40
101
tmp=ifelse([$1], ,1:0.4.2,$1)
···
57
118
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
58
119
if test "$gpgme_version_major" -gt "$req_major"; then
59
120
ok=yes
60
-
else
121
+
else
61
122
if test "$gpgme_version_major" -eq "$req_major"; then
62
123
if test "$gpgme_version_minor" -gt "$req_minor"; then
63
124
ok=yes
···
75
136
# If we have a recent GPGME, we should also check that the
76
137
# API is compatible.
77
138
if test "$req_gpgme_api" -gt 0 ; then
78
-
tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
139
+
if test -z "$use_gpgrt_config"; then
140
+
tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
141
+
else
142
+
tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
143
+
fi
79
144
if test "$tmp" -gt 0 ; then
80
145
if test "$req_gpgme_api" -ne "$tmp" ; then
81
146
ok=no
···
88
153
GPGME_LIBS=`$GPGME_CONFIG --libs`
89
154
AC_MSG_RESULT(yes)
90
155
ifelse([$2], , :, [$2])
156
+
_AM_PATH_GPGME_CONFIG_HOST_CHECK
91
157
else
92
158
GPGME_CFLAGS=""
93
159
GPGME_LIBS=""
···
98
164
AC_SUBST(GPGME_LIBS)
99
165
])
100
166
101
-
dnl AM_PATH_GPGME_PTH([MINIMUM-VERSION,
102
-
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
103
-
dnl Test for libgpgme and define GPGME_PTH_CFLAGS and GPGME_PTH_LIBS.
104
-
dnl
105
-
AC_DEFUN([AM_PATH_GPGME_PTH],
106
-
[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
107
-
tmp=ifelse([$1], ,1:0.4.2,$1)
108
-
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
109
-
req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
110
-
min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
111
-
else
112
-
req_gpgme_api=0
113
-
min_gpgme_version="$tmp"
114
-
fi
115
-
116
-
AC_MSG_CHECKING(for GPGME Pth - version >= $min_gpgme_version)
117
-
ok=no
118
-
if test "$GPGME_CONFIG" != "no" ; then
119
-
if `$GPGME_CONFIG --thread=pth 2> /dev/null` ; then
120
-
req_major=`echo $min_gpgme_version | \
121
-
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
122
-
req_minor=`echo $min_gpgme_version | \
123
-
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
124
-
req_micro=`echo $min_gpgme_version | \
125
-
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
126
-
if test "$gpgme_version_major" -gt "$req_major"; then
127
-
ok=yes
128
-
else
129
-
if test "$gpgme_version_major" -eq "$req_major"; then
130
-
if test "$gpgme_version_minor" -gt "$req_minor"; then
131
-
ok=yes
132
-
else
133
-
if test "$gpgme_version_minor" -eq "$req_minor"; then
134
-
if test "$gpgme_version_micro" -ge "$req_micro"; then
135
-
ok=yes
136
-
fi
137
-
fi
138
-
fi
139
-
fi
140
-
fi
141
-
fi
142
-
fi
143
-
if test $ok = yes; then
144
-
# If we have a recent GPGME, we should also check that the
145
-
# API is compatible.
146
-
if test "$req_gpgme_api" -gt 0 ; then
147
-
tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
148
-
if test "$tmp" -gt 0 ; then
149
-
if test "$req_gpgme_api" -ne "$tmp" ; then
150
-
ok=no
151
-
fi
152
-
fi
153
-
fi
154
-
fi
155
-
if test $ok = yes; then
156
-
GPGME_PTH_CFLAGS=`$GPGME_CONFIG --thread=pth --cflags`
157
-
GPGME_PTH_LIBS=`$GPGME_CONFIG --thread=pth --libs`
158
-
AC_MSG_RESULT(yes)
159
-
ifelse([$2], , :, [$2])
160
-
else
161
-
GPGME_PTH_CFLAGS=""
162
-
GPGME_PTH_LIBS=""
163
-
AC_MSG_RESULT(no)
164
-
ifelse([$3], , :, [$3])
165
-
fi
166
-
AC_SUBST(GPGME_PTH_CFLAGS)
167
-
AC_SUBST(GPGME_PTH_LIBS)
168
-
])
169
-
170
167
dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION,
171
168
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
172
169
dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS
···
195
192
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
196
193
if test "$gpgme_version_major" -gt "$req_major"; then
197
194
ok=yes
198
-
else
195
+
else
199
196
if test "$gpgme_version_major" -eq "$req_major"; then
200
197
if test "$gpgme_version_minor" -gt "$req_minor"; then
201
198
ok=yes
···
227
224
GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs`
228
225
AC_MSG_RESULT(yes)
229
226
ifelse([$2], , :, [$2])
227
+
_AM_PATH_GPGME_CONFIG_HOST_CHECK
230
228
else
231
229
GPGME_PTHREAD_CFLAGS=""
232
230
GPGME_PTHREAD_LIBS=""
···
264
262
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
265
263
if test "$gpgme_version_major" -gt "$req_major"; then
266
264
ok=yes
267
-
else
265
+
else
268
266
if test "$gpgme_version_major" -eq "$req_major"; then
269
267
if test "$gpgme_version_minor" -gt "$req_minor"; then
270
268
ok=yes
···
282
280
# If we have a recent GPGME, we should also check that the
283
281
# API is compatible.
284
282
if test "$req_gpgme_api" -gt 0 ; then
285
-
tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
283
+
if test -z "$use_gpgrt_config"; then
284
+
tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
285
+
else
286
+
tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
287
+
fi
286
288
if test "$tmp" -gt 0 ; then
287
289
if test "$req_gpgme_api" -ne "$tmp" ; then
288
290
ok=no
···
291
293
fi
292
294
fi
293
295
if test $ok = yes; then
294
-
GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
295
-
GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
296
+
if test -z "$use_gpgrt_config"; then
297
+
GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
298
+
GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
299
+
else
300
+
if $GPGRT_CONFIG gpgme-glib --exists; then
301
+
GPGME_CONFIG="$GPGRT_CONFIG gpgme-glib"
302
+
GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --cflags`
303
+
GPGME_GLIB_LIBS=`$GPGME_CONFIG --libs`
304
+
else
305
+
ok = no
306
+
fi
307
+
fi
308
+
fi
309
+
if test $ok = yes; then
296
310
AC_MSG_RESULT(yes)
297
311
ifelse([$2], , :, [$2])
312
+
_AM_PATH_GPGME_CONFIG_HOST_CHECK
298
313
else
299
314
GPGME_GLIB_CFLAGS=""
300
315
GPGME_GLIB_LIBS=""
···
304
319
AC_SUBST(GPGME_GLIB_CFLAGS)
305
320
AC_SUBST(GPGME_GLIB_LIBS)
306
321
])
307
-