e782b1ab06
* configure.ac: Replace internal libassuan by external libassuan.
* m4/libassuan.m4: New file.
* Makefile.am (assuan): Remove variable.
(SUBDIRS): Remove ${assuan}.
* assuan/: Removed.
src/
2009-10-20 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (assuan_cppflags, assuan_libobjs): Removed.
(gpgsm_components): Move engine-assuan.c to ...
(assuan_components): ... this new variable.
(main_sources): Add this new variable.
(AM_CPPFLAGS): Remove $(assuan_cppflags).
(AM_CFLAGS): Add @LIBASSUAN_CFLAGS@.
(libgpgme_la_DEPENDENCIES, libgpgme_pth_la_DEPENDENCIES)
(libgpgme_glib_la_DEPENDENCIES, libgpgme_qt_la_DEPENDENCIES)
(libgpgme_pthread_la_DEPENDENCIES): Remove $(assuan_libobjs).
(libgpgme_la_LIBADD, libgpgme_pth_la_LIBADD)
(libgpgme_glib_la_LIBADD, libgpgme_qt_la_LIBADD))
(libgpgme_pthread_la_LIBADD): Replace $(assuan_libobjs) by
@LIBASSUAN_LIBS@.
* priv-io.h [!HAVE_W32_SYSTEM]: Declare _gpgme_io_recvmsg,
_gpgme_io_sendmsg, _gpgme_io_waitpid.
* engine-backend.h: Define with [ENABLE_ASSUAN] instead
of [ENABLE_GPGSM].
* posix-io.c (_gpgme_io_waitpid): Make non-static.
* util.h (ENABLE_ASSUAN): Declar _gpgme_assuan_system_hooks,
_gpgme_assuan_malloc_hooks, _gpgme_assuan_log_cb.
* engine-gpgsm.c: Don't map assuan error codes. Use
assuan_release instead of assuan_disconnect.
(map_assuan_error): Remove function.
(gpgsm_new): Use new assuan context interface.
* engine-assuan.c: Use assuan_release instead of
assuan_disconnect.
(llass_new): Use new assuan context interface.
80 lines
3.1 KiB
Plaintext
80 lines
3.1 KiB
Plaintext
dnl Autoconf macros for libassuan
|
|
dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
|
|
dnl
|
|
dnl This file is free software; as a special exception the author gives
|
|
dnl unlimited permission to copy and/or distribute it, with or without
|
|
dnl modifications, as long as this notice is preserved.
|
|
dnl
|
|
dnl This file is distributed in the hope that it will be useful, but
|
|
dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
|
dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
|
|
dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION,
|
|
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
|
dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
|
|
dnl
|
|
AC_DEFUN([AM_PATH_LIBASSUAN],
|
|
[ AC_ARG_WITH(libassuan-prefix,
|
|
AC_HELP_STRING([--with-libassuan-prefix=PFX],
|
|
[prefix where LIBASSUAN is installed (optional)]),
|
|
libassuan_config_prefix="$withval", libassuan_config_prefix="")
|
|
if test x$libassuan_config_prefix != x ; then
|
|
libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
|
|
if test x${LIBASSUAN_CONFIG+set} != xset ; then
|
|
LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
|
|
fi
|
|
fi
|
|
|
|
AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
|
|
min_libassuan_version=ifelse([$1], ,0.0.1,$1)
|
|
AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
|
|
ok=no
|
|
if test "$LIBASSUAN_CONFIG" != "no" ; then
|
|
req_major=`echo $min_libassuan_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
|
req_minor=`echo $min_libassuan_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
|
req_micro=`echo $min_libassuan_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
|
libassuan_config_version=`$LIBASSUAN_CONFIG $libassuan_config_args --version`
|
|
major=`echo $libassuan_config_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
|
minor=`echo $libassuan_config_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
|
micro=`echo $libassuan_config_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
|
|
if test "$major" -gt "$req_major"; then
|
|
ok=yes
|
|
else
|
|
if test "$major" -eq "$req_major"; then
|
|
if test "$minor" -gt "$req_minor"; then
|
|
ok=yes
|
|
else
|
|
if test "$minor" -eq "$req_minor"; then
|
|
if test "$micro" -ge "$req_micro"; then
|
|
ok=yes
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
if test $ok = yes; then
|
|
LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
|
|
LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
|
|
LIBASSUAN_VERSION="$LIBASSUAN_CONFIG_VERSION"
|
|
AC_MSG_RESULT(yes)
|
|
ifelse([$2], , :, [$2])
|
|
else
|
|
LIBASSUAN_CFLAGS=""
|
|
LIBASSUAN_LIBS=""
|
|
LIBASSUAN_VERSION=""
|
|
AC_MSG_RESULT(no)
|
|
ifelse([$3], , :, [$3])
|
|
fi
|
|
AC_SUBST(LIBASSUAN_CFLAGS)
|
|
AC_SUBST(LIBASSUAN_LIBS)
|
|
AC_SUBST(LIBASSUAN_VERSION)
|
|
])
|