Page MenuHome GnuPG
Files F34212178

No OneTemporary
Actions

View Options

diff --git a/configure.in.in b/configure.in.in
index 80652a02..57a114b4 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,120 +1,115 @@
dnl BEGIN inline of gpgme.m4 from gpgme 0.4.4
dnl remaned from AM_PATH_GPGME to KDEPIM_PATH_GPGME and inlined here
dnl to not require aclocal fiddling...
dnl Autoconf macros for libgpgme
dnl Id: gpgme.m4,v 1.6 2003/09/03 01:15:56 marcus Exp
AC_DEFUN(_KDEPIM_PATH_GPGME_CONFIG,
[ AC_ARG_WITH(gpgme-prefix,
AC_HELP_STRING([--with-gpgme-prefix=PFX],
[prefix where GPGME is installed (optional)]),
gpgme_config_prefix="$withval", gpgme_config_prefix="")
if test "x$gpgme_config_prefix" != x ; then
gpgme_config_path="$gpgme_config_prefix/bin"
else
gpgme_config_path="$PATH"
fi
AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no, $gpgme_config_path)
if test "x$GPGME_CONFIG" != "xno" ; then
gpgme_version=`$GPGME_CONFIG --version`
gpgme_version_major=`echo $gpgme_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
gpgme_version_minor=`echo $gpgme_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
gpgme_version_micro=`echo $gpgme_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
fi
])
dnl AM_PATH_GPGME([MINIMUM-VERSION,
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS.
dnl
AC_DEFUN([KDEPIM_PATH_GPGME],
[ AC_REQUIRE([_KDEPIM_PATH_GPGME_CONFIG])dnl
min_gpgme_version=ifelse([$1], ,0.4.2,$1)
AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
ok=no
if test "$GPGME_CONFIG" != "no" ; then
req_major=`echo $min_gpgme_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
req_minor=`echo $min_gpgme_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
req_micro=`echo $min_gpgme_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
if test "$gpgme_version_major" -gt "$req_major"; then
ok=yes
else
if test "$gpgme_version_major" -eq "$req_major"; then
if test "$gpgme_version_minor" -gt "$req_minor"; then
ok=yes
else
if test "$gpgme_version_minor" -eq "$req_minor"; then
if test "$gpgme_version_micro" -ge "$req_micro"; then
ok=yes
fi
fi
fi
fi
fi
fi
if test $ok = yes; then
GPGME_CFLAGS=`$GPGME_CONFIG --cflags`
GPGME_LIBS=`$GPGME_CONFIG --libs`
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
GPGME_CFLAGS=""
GPGME_LIBS=""
AC_MSG_RESULT(no)
ifelse([$3], , :, [$3])
fi
AC_SUBST(GPGME_CFLAGS)
AC_SUBST(GPGME_LIBS)
])
dnl
dnl snip AM_PATH_GPGME_{PTH,PTHREAD}
dnl
dnl END inline of gpgme.m4
kdepim_needs_gpgme_copy=""
KDEPIM_PATH_GPGME(0.4.4,[
AC_LANG_SAVE
AC_LANG_C
kdepim_gpgmepp_save_cflags="$CFLAGS"
CFLAGS="$GPGME_CFLAGS"
AC_MSG_CHECKING([if gpgme has GPGME_KEYLIST_MODE_VALIDATE])
AC_TRY_COMPILE([#include <gpgme.h>], [
gpgme_keylist_mode_t mode = GPGME_KEYLIST_MODE_VALIDATE;
], [
- have_gpgme_keylist_mode_validate=yes
+ AC_DEFINE(HAVE_GPGME_KEYLIST_MODE_VALIDATE, 1, [Define to 1 if your gpgme supports GPGME_KEYLIST_MODE_VALIDATE])
AC_MSG_RESULT([yes])
], [
- have_gpgme_keylist_mode_validate=no
AC_MSG_RESULT([no])
])
CFLAGS="$kdepim_gpgmepp_save_cflags"
AC_LANG_RESTORE
],[
kdepim_needs_gpgme_copy="true"
- have_gpgme_keylist_mode_validate=no
GPGME_CFLAGS='-I$(top_srcdir)/libkdenetwork/libgpgme-copy/gpgme -I$(top_srcdir)/libkdenetwork/libgpg-error-copy'
GPGME_LIBS='$(top_builddir)/libkdenetwork/libgpgme-copy/gpgme/libgpgme.la'
])
AM_CONDITIONAL(needs_gpgme_copy, test -n "$kdepim_needs_gpgme_copy")
-AC_DEFINE(HAVE_GPGME_KEYLIST_MODE_VALIDATE, test "x$have_gpgme_keylist_mode_validate" = "xyes",
-[Define to 1 if your gpgme supports GPGME_KEYLIST_MODE_VALIDATE])
-
dnl Always true - either from the local copy or from the system lib.
dnl Only kept for compat, feel free to clean up those 3 lines
AC_DEFINE(HAVE_GPGME_H, 1, [Define to 1 if you have gpgme >= 0.4.4])
AC_DEFINE(HAVE_GPGME_0_4_BRANCH, 1, [Define to 1 if you have gpgme >= 0.4.4])
AM_CONDITIONAL(have_gpgme, true)

File Metadata

Mime Type
text/x-diff
Expires
Fri, Dec 19, 3:45 AM (5 h, 24 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
d9/a2/c07a1db0ff57bd74dd65a95b93c4

Event Timeline