2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* README: Refer to COPYING.LESSER and "each file" instead of
COPYING.
* COPYING.LESSER: New file.
* gpgme.spec.in (%doc): Add COPYING.LESSER.
* acinclude.m4, configure.ac, Makefile.am: Change license to LGPL
2.1 or later.
* TODO: Add copyright notice.
* README.CVS: Likewise.
assuan/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* README.1st: Add copyright notice.
doc/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am: Change license to LGPL.
(gpgme_TEXINFOS): Replace gpl.texi with lesser.texi.
* gpgme.texi: Change license to LGPL (also for documentation of
GPGME's license).
* lesser.texi: New file.
* gpl.texi: File removed.
gpgme/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* putc_unlocked.c, funopen.c: I just claim copyright on these
files and change their license to LGPL, because they are totally
trivial wrapper functions.
* isascii.c: Change copyright notice to the one from ctype/ctype.h
in the GNU C Library (CVS Head 2004-10-10), where isascii is
defined as a macro doing exactly the same as the function in this
file.
* memrchr.c: Update from the GNU C Library (CVS Head 2001-07-06).
* stpcpy.c: Update from the GNU C Library (CVS Head 2004-10-10).
* ath.c, ath-compat.c, ath.h, ath-pth.c, ath-pth-compat.c,
ath-pthread.c, ath-pthread-compat.c, context.h, conversion.c,
data.c, data-compat.c, data-fd.c, data.h, data-mem.c,
data-stream.c, data-user.c, debug.c, debug.h, decrypt.c,
decrypt-verify.c, delete.c, edit.c, encrypt.c, encrypt-sign.c,
engine-backend.h, engine.c, engine-gpgsm.c, engine.h, error.c,
export.c, genkey.c, get-env.c, gpgme.c, gpgme.h, import.c, io.h,
key.c, keylist.c, mkstatus, Makefile.am, ops.h, op-support.c,
passphrase.c, posix-io.c, posix-sema.c, posix-util.c, progress.c,
rungpg.c, sema.h, sign.c, signers.c, trust-item.c, trustlist.c,
util.h, verify.c, version.c, w32-io.c, w32-sema.c, w32-util.c,
wait.c, wait-global.c, wait.h, wait-private.c, wait-user.c: Change
license to LGPL.
tests/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* gpg/mkdemodirs: Add copyright notice.
* gpgsm/Makefile.am, gpgsm/t-support.h, gpgsm/t-decrypt.c,
gpgsm/t-encrypt.c, gpgsm/t-export.c, gpgsm/t-genkey.c,
gpgsm/t-import.c, gpgsm/t-keylist.c, gpgsm/t-sign.c,
gpgsm/t-verify.c, gpg/Makefile.am, gpg/t-decrypt.c,
gpg/t-decrypt-verify.c, gpg/t-edit.c, gpg/t-encrypt.c,
gpg/t-encrypt-sign.c, gpg/t-encrypt-sym.c, gpg/t-eventloop.c,
gpg/t-export.c, gpg/t-genkey.c, gpg/t-import.c, gpg/t-keylist.c,
gpg/t-keylist-sig.c, gpg/t-sign.c, gpg/t-signers.c,
gpg/t-support.h, gpg/t-thread1.c, gpg/t-trustlist.c,
gpg/t-verify.c, Makefile.am, t-data.c, t-engine-info.c,
t-version.c: Change license to LGPL.
2004-12-07 21:13:39 +00:00
|
|
|
# configure.ac for GPGME
|
2001-04-02 08:40:32 +00:00
|
|
|
# Copyright (C) 2000 Werner Koch (dd9jn)
|
2008-10-17 18:57:49 +00:00
|
|
|
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 g10 Code GmbH
|
2000-10-27 14:55:24 +00:00
|
|
|
#
|
2001-04-02 08:40:32 +00:00
|
|
|
# This file is part of GPGME.
|
|
|
|
#
|
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* README: Refer to COPYING.LESSER and "each file" instead of
COPYING.
* COPYING.LESSER: New file.
* gpgme.spec.in (%doc): Add COPYING.LESSER.
* acinclude.m4, configure.ac, Makefile.am: Change license to LGPL
2.1 or later.
* TODO: Add copyright notice.
* README.CVS: Likewise.
assuan/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* README.1st: Add copyright notice.
doc/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am: Change license to LGPL.
(gpgme_TEXINFOS): Replace gpl.texi with lesser.texi.
* gpgme.texi: Change license to LGPL (also for documentation of
GPGME's license).
* lesser.texi: New file.
* gpl.texi: File removed.
gpgme/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* putc_unlocked.c, funopen.c: I just claim copyright on these
files and change their license to LGPL, because they are totally
trivial wrapper functions.
* isascii.c: Change copyright notice to the one from ctype/ctype.h
in the GNU C Library (CVS Head 2004-10-10), where isascii is
defined as a macro doing exactly the same as the function in this
file.
* memrchr.c: Update from the GNU C Library (CVS Head 2001-07-06).
* stpcpy.c: Update from the GNU C Library (CVS Head 2004-10-10).
* ath.c, ath-compat.c, ath.h, ath-pth.c, ath-pth-compat.c,
ath-pthread.c, ath-pthread-compat.c, context.h, conversion.c,
data.c, data-compat.c, data-fd.c, data.h, data-mem.c,
data-stream.c, data-user.c, debug.c, debug.h, decrypt.c,
decrypt-verify.c, delete.c, edit.c, encrypt.c, encrypt-sign.c,
engine-backend.h, engine.c, engine-gpgsm.c, engine.h, error.c,
export.c, genkey.c, get-env.c, gpgme.c, gpgme.h, import.c, io.h,
key.c, keylist.c, mkstatus, Makefile.am, ops.h, op-support.c,
passphrase.c, posix-io.c, posix-sema.c, posix-util.c, progress.c,
rungpg.c, sema.h, sign.c, signers.c, trust-item.c, trustlist.c,
util.h, verify.c, version.c, w32-io.c, w32-sema.c, w32-util.c,
wait.c, wait-global.c, wait.h, wait-private.c, wait-user.c: Change
license to LGPL.
tests/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* gpg/mkdemodirs: Add copyright notice.
* gpgsm/Makefile.am, gpgsm/t-support.h, gpgsm/t-decrypt.c,
gpgsm/t-encrypt.c, gpgsm/t-export.c, gpgsm/t-genkey.c,
gpgsm/t-import.c, gpgsm/t-keylist.c, gpgsm/t-sign.c,
gpgsm/t-verify.c, gpg/Makefile.am, gpg/t-decrypt.c,
gpg/t-decrypt-verify.c, gpg/t-edit.c, gpg/t-encrypt.c,
gpg/t-encrypt-sign.c, gpg/t-encrypt-sym.c, gpg/t-eventloop.c,
gpg/t-export.c, gpg/t-genkey.c, gpg/t-import.c, gpg/t-keylist.c,
gpg/t-keylist-sig.c, gpg/t-sign.c, gpg/t-signers.c,
gpg/t-support.h, gpg/t-thread1.c, gpg/t-trustlist.c,
gpg/t-verify.c, Makefile.am, t-data.c, t-engine-info.c,
t-version.c: Change license to LGPL.
2004-12-07 21:13:39 +00:00
|
|
|
# GPGME is free software; you can redistribute it and/or modify it
|
|
|
|
# under the terms of the GNU Lesser General Public License as
|
|
|
|
# published by the Free Software Foundation; either version 2.1 of the
|
|
|
|
# License, or (at your option) any later version.
|
2001-04-02 08:40:32 +00:00
|
|
|
#
|
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* README: Refer to COPYING.LESSER and "each file" instead of
COPYING.
* COPYING.LESSER: New file.
* gpgme.spec.in (%doc): Add COPYING.LESSER.
* acinclude.m4, configure.ac, Makefile.am: Change license to LGPL
2.1 or later.
* TODO: Add copyright notice.
* README.CVS: Likewise.
assuan/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* README.1st: Add copyright notice.
doc/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am: Change license to LGPL.
(gpgme_TEXINFOS): Replace gpl.texi with lesser.texi.
* gpgme.texi: Change license to LGPL (also for documentation of
GPGME's license).
* lesser.texi: New file.
* gpl.texi: File removed.
gpgme/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* putc_unlocked.c, funopen.c: I just claim copyright on these
files and change their license to LGPL, because they are totally
trivial wrapper functions.
* isascii.c: Change copyright notice to the one from ctype/ctype.h
in the GNU C Library (CVS Head 2004-10-10), where isascii is
defined as a macro doing exactly the same as the function in this
file.
* memrchr.c: Update from the GNU C Library (CVS Head 2001-07-06).
* stpcpy.c: Update from the GNU C Library (CVS Head 2004-10-10).
* ath.c, ath-compat.c, ath.h, ath-pth.c, ath-pth-compat.c,
ath-pthread.c, ath-pthread-compat.c, context.h, conversion.c,
data.c, data-compat.c, data-fd.c, data.h, data-mem.c,
data-stream.c, data-user.c, debug.c, debug.h, decrypt.c,
decrypt-verify.c, delete.c, edit.c, encrypt.c, encrypt-sign.c,
engine-backend.h, engine.c, engine-gpgsm.c, engine.h, error.c,
export.c, genkey.c, get-env.c, gpgme.c, gpgme.h, import.c, io.h,
key.c, keylist.c, mkstatus, Makefile.am, ops.h, op-support.c,
passphrase.c, posix-io.c, posix-sema.c, posix-util.c, progress.c,
rungpg.c, sema.h, sign.c, signers.c, trust-item.c, trustlist.c,
util.h, verify.c, version.c, w32-io.c, w32-sema.c, w32-util.c,
wait.c, wait-global.c, wait.h, wait-private.c, wait-user.c: Change
license to LGPL.
tests/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* gpg/mkdemodirs: Add copyright notice.
* gpgsm/Makefile.am, gpgsm/t-support.h, gpgsm/t-decrypt.c,
gpgsm/t-encrypt.c, gpgsm/t-export.c, gpgsm/t-genkey.c,
gpgsm/t-import.c, gpgsm/t-keylist.c, gpgsm/t-sign.c,
gpgsm/t-verify.c, gpg/Makefile.am, gpg/t-decrypt.c,
gpg/t-decrypt-verify.c, gpg/t-edit.c, gpg/t-encrypt.c,
gpg/t-encrypt-sign.c, gpg/t-encrypt-sym.c, gpg/t-eventloop.c,
gpg/t-export.c, gpg/t-genkey.c, gpg/t-import.c, gpg/t-keylist.c,
gpg/t-keylist-sig.c, gpg/t-sign.c, gpg/t-signers.c,
gpg/t-support.h, gpg/t-thread1.c, gpg/t-trustlist.c,
gpg/t-verify.c, Makefile.am, t-data.c, t-engine-info.c,
t-version.c: Change license to LGPL.
2004-12-07 21:13:39 +00:00
|
|
|
# GPGME is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
|
|
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
|
|
|
|
# Public License for more details.
|
2001-04-02 08:40:32 +00:00
|
|
|
#
|
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* README: Refer to COPYING.LESSER and "each file" instead of
COPYING.
* COPYING.LESSER: New file.
* gpgme.spec.in (%doc): Add COPYING.LESSER.
* acinclude.m4, configure.ac, Makefile.am: Change license to LGPL
2.1 or later.
* TODO: Add copyright notice.
* README.CVS: Likewise.
assuan/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* README.1st: Add copyright notice.
doc/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am: Change license to LGPL.
(gpgme_TEXINFOS): Replace gpl.texi with lesser.texi.
* gpgme.texi: Change license to LGPL (also for documentation of
GPGME's license).
* lesser.texi: New file.
* gpl.texi: File removed.
gpgme/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* putc_unlocked.c, funopen.c: I just claim copyright on these
files and change their license to LGPL, because they are totally
trivial wrapper functions.
* isascii.c: Change copyright notice to the one from ctype/ctype.h
in the GNU C Library (CVS Head 2004-10-10), where isascii is
defined as a macro doing exactly the same as the function in this
file.
* memrchr.c: Update from the GNU C Library (CVS Head 2001-07-06).
* stpcpy.c: Update from the GNU C Library (CVS Head 2004-10-10).
* ath.c, ath-compat.c, ath.h, ath-pth.c, ath-pth-compat.c,
ath-pthread.c, ath-pthread-compat.c, context.h, conversion.c,
data.c, data-compat.c, data-fd.c, data.h, data-mem.c,
data-stream.c, data-user.c, debug.c, debug.h, decrypt.c,
decrypt-verify.c, delete.c, edit.c, encrypt.c, encrypt-sign.c,
engine-backend.h, engine.c, engine-gpgsm.c, engine.h, error.c,
export.c, genkey.c, get-env.c, gpgme.c, gpgme.h, import.c, io.h,
key.c, keylist.c, mkstatus, Makefile.am, ops.h, op-support.c,
passphrase.c, posix-io.c, posix-sema.c, posix-util.c, progress.c,
rungpg.c, sema.h, sign.c, signers.c, trust-item.c, trustlist.c,
util.h, verify.c, version.c, w32-io.c, w32-sema.c, w32-util.c,
wait.c, wait-global.c, wait.h, wait-private.c, wait-user.c: Change
license to LGPL.
tests/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* gpg/mkdemodirs: Add copyright notice.
* gpgsm/Makefile.am, gpgsm/t-support.h, gpgsm/t-decrypt.c,
gpgsm/t-encrypt.c, gpgsm/t-export.c, gpgsm/t-genkey.c,
gpgsm/t-import.c, gpgsm/t-keylist.c, gpgsm/t-sign.c,
gpgsm/t-verify.c, gpg/Makefile.am, gpg/t-decrypt.c,
gpg/t-decrypt-verify.c, gpg/t-edit.c, gpg/t-encrypt.c,
gpg/t-encrypt-sign.c, gpg/t-encrypt-sym.c, gpg/t-eventloop.c,
gpg/t-export.c, gpg/t-genkey.c, gpg/t-import.c, gpg/t-keylist.c,
gpg/t-keylist-sig.c, gpg/t-sign.c, gpg/t-signers.c,
gpg/t-support.h, gpg/t-thread1.c, gpg/t-trustlist.c,
gpg/t-verify.c, Makefile.am, t-data.c, t-engine-info.c,
t-version.c: Change license to LGPL.
2004-12-07 21:13:39 +00:00
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
|
|
# License along with this program; if not, write to the Free Software
|
2001-04-02 08:40:32 +00:00
|
|
|
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
|
|
|
|
|
|
# (Process this file with autoconf to produce a configure script.)
|
2005-01-12 10:28:42 +00:00
|
|
|
AC_PREREQ(2.59)
|
2008-01-30 14:17:26 +00:00
|
|
|
min_automake_version="1.10"
|
2004-01-12 13:41:20 +00:00
|
|
|
|
2002-07-02 09:08:21 +00:00
|
|
|
# Version number: Remember to change it immediately *after* a release.
|
2007-09-17 10:21:20 +00:00
|
|
|
# Make sure to run "svn up" and "./autogen.sh --force"
|
|
|
|
# before a "make dist". See below for the LT versions.
|
2006-01-03 18:40:33 +00:00
|
|
|
#
|
2007-09-17 10:21:20 +00:00
|
|
|
# The SVN version is usually the next intended release version with
|
|
|
|
# the string "-svnNNN" appended. The reason for this is that tests for a
|
2006-01-03 18:40:33 +00:00
|
|
|
# specific feature can already be done under the assumption that the
|
2007-09-17 10:21:20 +00:00
|
|
|
# SVN version is the most recent one in a branch. To disable the SVN
|
|
|
|
# version for the real release, set the my_issvn macro to no.
|
2009-06-19 02:04:24 +00:00
|
|
|
m4_define(my_version, [1.2.1])
|
|
|
|
m4_define(my_issvn, [yes])
|
2007-09-17 10:21:20 +00:00
|
|
|
|
2009-12-22 13:00:30 +00:00
|
|
|
m4_define([svn_revision], m4_esyscmd([printf "%d" $( (svn info 2>/dev/null \
|
2007-09-17 10:21:20 +00:00
|
|
|
|| echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
|
2008-04-28 18:42:56 +00:00
|
|
|
AC_INIT([gpgme],
|
|
|
|
[my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],
|
2007-09-17 10:21:20 +00:00
|
|
|
[bug-gpgme@gnupg.org])
|
|
|
|
|
2006-01-03 18:40:33 +00:00
|
|
|
|
2002-07-02 09:08:21 +00:00
|
|
|
# LT Version numbers, remember to change them just *before* a release.
|
2001-12-18 23:32:08 +00:00
|
|
|
# (Code changed: REVISION++)
|
|
|
|
# (Interfaces added/removed/changed: CURRENT++, REVISION=0)
|
|
|
|
# (Interfaces added: AGE++)
|
2004-02-01 13:39:45 +00:00
|
|
|
# (Interfaces removed/changed: AGE=0)
|
2002-03-04 11:16:11 +00:00
|
|
|
#
|
2009-06-18 17:16:47 +00:00
|
|
|
LIBGPGME_LT_CURRENT=18
|
2004-02-01 13:39:45 +00:00
|
|
|
# Subtract 2 from this value if you want to make the LFS transition an
|
|
|
|
# ABI break. [Note to self: Remove this comment with the next regular break.]
|
2009-06-18 17:16:47 +00:00
|
|
|
LIBGPGME_LT_AGE=7
|
2009-06-18 17:18:41 +00:00
|
|
|
LIBGPGME_LT_REVISION=0
|
2004-05-21 19:49:38 +00:00
|
|
|
|
|
|
|
# If the API is changed in an incompatible way: increment the next counter.
|
|
|
|
GPGME_CONFIG_API_VERSION=1
|
2000-10-27 14:55:24 +00:00
|
|
|
##############################################
|
2005-03-09 16:03:05 +00:00
|
|
|
|
2001-12-19 12:59:19 +00:00
|
|
|
|
2007-09-17 10:21:20 +00:00
|
|
|
BUILD_REVISION=svn_revision
|
2001-12-19 12:59:19 +00:00
|
|
|
PACKAGE=$PACKAGE_NAME
|
|
|
|
VERSION=$PACKAGE_VERSION
|
|
|
|
|
2008-11-03 17:24:09 +00:00
|
|
|
AC_CONFIG_SRCDIR(src/gpgme.h.in)
|
2004-09-16 22:17:51 +00:00
|
|
|
dnl FIXME: Enable this with autoconf 2.59.
|
|
|
|
dnl AC_CONFIG_MACRO_DIR(m4)
|
2001-12-19 12:59:19 +00:00
|
|
|
AM_CONFIG_HEADER(config.h)
|
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
Update to libtool 2.2.6a.
* configure.ac: Invoke AC_CONFIG_MACRO_DIR.
(AC_LIBTOOL_WIN32_DLL, AC_LIBTOOL_RC): Replace by ...
(LT_PREREQ, LT_INIT, LT_LANG): ... these.
* config.guess, config.sub, install-sh, ltmain.sh, m4/libtool.m4:
Updated to libtool 2.2.6a.
* m4/ltoptions.m4, m4/ltsugar.m4, m4/ltversion.m4,
m4/lt~obsolete.m4: New files from libtool 2.2.6a.
src/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (LTRCCOMPILE): Refactor with ...
(RCCOMPILE): ... this new macro.
(SUFFIXES): Add .lo.
(gpgme_res_ldflag): Removed.
(gpgme_res): Use libtool object file name here.
(libgpgme_la_LDFLAGS): Remove gpgme_res_ldflag usage.
2009-12-08 21:38:22 +00:00
|
|
|
AC_CONFIG_MACRO_DIR([m4])
|
2001-12-19 12:59:19 +00:00
|
|
|
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
|
|
|
|
AM_MAINTAINER_MODE
|
2003-09-02 21:46:31 +00:00
|
|
|
AC_CANONICAL_HOST
|
2001-12-19 12:59:19 +00:00
|
|
|
|
2005-03-09 16:03:05 +00:00
|
|
|
# Enable GNU extensions on systems that have them.
|
|
|
|
AC_GNU_SOURCE
|
2002-04-04 23:31:11 +00:00
|
|
|
|
|
|
|
AH_VERBATIM([_REENTRANT],
|
|
|
|
[/* To allow the use of GPGME in multithreaded programs we have to use
|
|
|
|
special features from the library.
|
|
|
|
IMPORTANT: gpgme is not yet fully reentrant and you should use it
|
|
|
|
only from one thread. */
|
|
|
|
#ifndef _REENTRANT
|
|
|
|
# define _REENTRANT 1
|
|
|
|
#endif])
|
|
|
|
|
2001-12-19 12:59:19 +00:00
|
|
|
AC_PROG_CC
|
2007-09-06 22:41:11 +00:00
|
|
|
AC_PROG_CXX
|
2000-10-27 14:55:24 +00:00
|
|
|
|
|
|
|
AC_SUBST(LIBGPGME_LT_CURRENT)
|
|
|
|
AC_SUBST(LIBGPGME_LT_AGE)
|
|
|
|
AC_SUBST(LIBGPGME_LT_REVISION)
|
|
|
|
|
2001-12-19 12:59:19 +00:00
|
|
|
AC_SUBST(PACKAGE)
|
|
|
|
AC_SUBST(VERSION)
|
|
|
|
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
|
|
|
|
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
|
|
|
|
|
2003-08-18 19:17:08 +00:00
|
|
|
# Don't default to build static libs.
|
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
Update to libtool 2.2.6a.
* configure.ac: Invoke AC_CONFIG_MACRO_DIR.
(AC_LIBTOOL_WIN32_DLL, AC_LIBTOOL_RC): Replace by ...
(LT_PREREQ, LT_INIT, LT_LANG): ... these.
* config.guess, config.sub, install-sh, ltmain.sh, m4/libtool.m4:
Updated to libtool 2.2.6a.
* m4/ltoptions.m4, m4/ltsugar.m4, m4/ltversion.m4,
m4/lt~obsolete.m4: New files from libtool 2.2.6a.
src/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (LTRCCOMPILE): Refactor with ...
(RCCOMPILE): ... this new macro.
(SUFFIXES): Add .lo.
(gpgme_res_ldflag): Removed.
(gpgme_res): Use libtool object file name here.
(libgpgme_la_LDFLAGS): Remove gpgme_res_ldflag usage.
2009-12-08 21:38:22 +00:00
|
|
|
LT_PREREQ([2.2.6])
|
|
|
|
LT_INIT([win32-dll disable-static])
|
|
|
|
LT_LANG([Windows Resource])
|
2000-11-23 15:28:15 +00:00
|
|
|
|
2002-12-23 23:45:28 +00:00
|
|
|
# For now we hardcode the use of version scripts. It would be better
|
|
|
|
# to write a test for this or even implement this within libtool.
|
|
|
|
have_ld_version_script=no
|
|
|
|
case "${host}" in
|
|
|
|
*-*-linux*)
|
|
|
|
have_ld_version_script=yes
|
|
|
|
;;
|
|
|
|
*-*-gnu*)
|
|
|
|
have_ld_version_script=yes
|
|
|
|
;;
|
2008-09-16 15:30:44 +00:00
|
|
|
*-apple-darwin*)
|
|
|
|
AC_DEFINE(_XOPEN_SOURCE, 500, Activate POSIX interface on MacOS X)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2002-12-23 23:45:28 +00:00
|
|
|
AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
|
|
|
|
|
2001-11-18 03:31:31 +00:00
|
|
|
GPG_DEFAULT=no
|
|
|
|
GPGSM_DEFAULT=no
|
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
GPGCONF_DEFAULT=no
|
2009-10-22 16:44:07 +00:00
|
|
|
G13_DEFAULT=no
|
2000-12-06 12:17:10 +00:00
|
|
|
component_system=None
|
2005-03-09 16:03:05 +00:00
|
|
|
have_dosish_system=no
|
|
|
|
have_w32_system=no
|
2007-09-07 19:38:50 +00:00
|
|
|
build_w32_glib=no
|
|
|
|
build_w32_qt=no
|
2002-12-23 23:45:28 +00:00
|
|
|
case "${host}" in
|
2005-03-09 16:03:05 +00:00
|
|
|
*-mingw32*)
|
2000-11-23 15:28:15 +00:00
|
|
|
# special stuff for Windoze NT
|
2002-03-18 00:04:06 +00:00
|
|
|
have_dosish_system=yes
|
2005-03-09 16:03:05 +00:00
|
|
|
have_w32_system=yes
|
2001-11-18 03:31:31 +00:00
|
|
|
GPG_DEFAULT='c:\\gnupg\\gpg.exe'
|
2007-07-08 15:46:10 +00:00
|
|
|
GPGSM_DEFAULT='c:\\gnupg\\gpgsm.exe'
|
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
GPGCONF_DEFAULT='c:\\gnupg\\gpgconf.exe'
|
2009-10-22 16:44:07 +00:00
|
|
|
G13_DEFAULT='c:\\gnupg\\g13.exe'
|
2000-12-12 13:31:25 +00:00
|
|
|
#component_system='COM+'
|
2007-09-07 19:38:50 +00:00
|
|
|
|
|
|
|
AM_PATH_GLIB_2_0
|
|
|
|
AC_ARG_ENABLE(w32-glib,
|
|
|
|
AC_HELP_STRING([--enable-w32-glib], [build GPGME Glib for W32]),
|
|
|
|
build_w32_glib=$enableval)
|
|
|
|
|
|
|
|
# Check disabled, because the qt-dev packages in gpg4win do
|
|
|
|
# not provide any support for cross compilation.
|
|
|
|
# PKG_CHECK_MODULES(QT4_CORE, QtCore)
|
|
|
|
|
|
|
|
# Use it like this:
|
|
|
|
# ./configure --enable-w32-qt QT4_CORE_CFLAGS="..." QT4_CORE_LIBS="..."
|
|
|
|
AC_SUBST(QT4_CORE_CFLAGS)
|
|
|
|
AC_SUBST(QT4_CORE_LIBS)
|
|
|
|
AC_ARG_ENABLE(w32-qt,
|
|
|
|
AC_HELP_STRING([--enable-w32-qt], [build GPGME Qt for W32]),
|
|
|
|
build_w32_qt=$enableval)
|
2000-11-23 15:28:15 +00:00
|
|
|
;;
|
|
|
|
*)
|
2002-06-02 19:19:25 +00:00
|
|
|
AC_CHECK_PTH(1.2.0,,,no,have_pth=yes)
|
|
|
|
if test "$have_pth" = yes; then
|
|
|
|
AC_DEFINE(HAVE_PTH, ,[Define if we have Pth.])
|
|
|
|
fi
|
|
|
|
AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes)
|
|
|
|
if test "$have_pthread" = yes; then
|
|
|
|
AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.])
|
|
|
|
fi
|
|
|
|
|
2003-08-18 19:17:08 +00:00
|
|
|
# XXX: Probably use exec-prefix here?
|
|
|
|
# GPG_DEFAULT='/usr/bin/gpg'
|
|
|
|
# GPGSM_DEFAULT='/usr/bin/gpgsm'
|
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
# GPGCONF_DEFAULT='/usr/bin/gpgconf'
|
2009-10-22 16:44:07 +00:00
|
|
|
# G13_DEFAULT='/usr/bin/g13'
|
2001-11-18 03:31:31 +00:00
|
|
|
;;
|
2000-11-23 15:28:15 +00:00
|
|
|
esac
|
2005-03-09 16:03:05 +00:00
|
|
|
|
|
|
|
if test "$have_dosish_system" = yes; then
|
|
|
|
AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
|
|
|
|
[Defined if we run on some of the PCDOS like systems
|
|
|
|
(DOS, Windoze. OS/2) with special properties like
|
|
|
|
no file modes])
|
|
|
|
fi
|
|
|
|
AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes)
|
|
|
|
|
|
|
|
if test "$have_w32_system" = yes; then
|
|
|
|
AC_DEFINE(HAVE_W32_SYSTEM,1, [Defined if we run on a W32 API based system])
|
|
|
|
fi
|
|
|
|
AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
|
2005-11-17 18:45:14 +00:00
|
|
|
AM_CONDITIONAL(BUILD_W32_GLIB, test "$build_w32_glib" = yes)
|
2007-09-06 22:41:11 +00:00
|
|
|
AM_CONDITIONAL(BUILD_W32_QT, test "$build_w32_qt" = yes)
|
|
|
|
|
2002-06-02 19:19:25 +00:00
|
|
|
AM_CONDITIONAL(HAVE_PTH, test "$have_pth" = "yes")
|
|
|
|
AM_CONDITIONAL(HAVE_PTHREAD, test "$have_pthread" = "yes")
|
2000-11-23 15:28:15 +00:00
|
|
|
|
2003-08-18 19:17:08 +00:00
|
|
|
|
2009-10-20 15:39:15 +00:00
|
|
|
|
2003-08-18 19:17:08 +00:00
|
|
|
# Checks for header files.
|
2002-09-20 10:44:22 +00:00
|
|
|
AC_CHECK_HEADERS(sys/select.h)
|
2009-10-20 15:39:15 +00:00
|
|
|
AC_CHECK_HEADERS([sys/uio.h])
|
2002-09-20 10:44:22 +00:00
|
|
|
|
2001-11-18 03:31:31 +00:00
|
|
|
|
2003-08-18 19:17:08 +00:00
|
|
|
# Type checks.
|
2006-01-05 08:58:50 +00:00
|
|
|
AC_C_INLINE
|
2001-11-18 03:31:31 +00:00
|
|
|
AC_CHECK_SIZEOF(unsigned int)
|
2004-02-01 13:39:45 +00:00
|
|
|
AC_SYS_LARGEFILE
|
|
|
|
AC_TYPE_OFF_T
|
2009-06-22 14:50:17 +00:00
|
|
|
AC_TYPE_UINTPTR_T
|
2000-10-27 14:55:24 +00:00
|
|
|
|
2009-05-05 17:03:33 +00:00
|
|
|
# A simple compile time check in gpgme.h for GNU/Linux systems that
|
|
|
|
# prevents a file offset bits mismatch between gpgme and the application.
|
|
|
|
NEED__FILE_OFFSET_BITS=0
|
2009-12-17 17:36:20 +00:00
|
|
|
case "$ac_cv_sys_file_offset_bits" in
|
|
|
|
"" | no | unknown) ;;
|
2009-05-05 17:03:33 +00:00
|
|
|
*)
|
|
|
|
NEED__FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_SUBST(NEED__FILE_OFFSET_BITS)
|
|
|
|
|
|
|
|
|
2003-08-18 19:17:08 +00:00
|
|
|
# Checks for compiler features.
|
2001-11-18 03:31:31 +00:00
|
|
|
if test "$GCC" = yes; then
|
|
|
|
CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
|
2005-11-18 16:52:38 +00:00
|
|
|
if test "$have_w32_system" = yes; then
|
|
|
|
CFLAGS="$CFLAGS -mms-bitfields"
|
|
|
|
fi
|
2001-11-18 03:31:31 +00:00
|
|
|
fi
|
|
|
|
|
2009-12-22 13:00:30 +00:00
|
|
|
# Only used for debugging, so no serious test needed (for actual
|
|
|
|
# functionality you have to test libc as well, this only tests the
|
|
|
|
# compiler).
|
|
|
|
AC_CACHE_CHECK([for __thread],[gpgme_cv_tls_works],
|
|
|
|
AC_COMPILE_IFELSE([__thread int foo;],
|
|
|
|
gpgme_cv_tls_works=yes,gpgme_cv_tls_works=no))
|
|
|
|
if test "$gpgme_cv_tls_works" = yes; then
|
|
|
|
AC_DEFINE(HAVE_TLS, [1], [Define if __thread is supported])
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
2003-08-18 19:17:08 +00:00
|
|
|
# Checks for library functions.
|
2004-02-01 13:39:45 +00:00
|
|
|
AC_FUNC_FSEEKO
|
|
|
|
|
2002-02-13 14:59:22 +00:00
|
|
|
AC_REPLACE_FUNCS(vasprintf)
|
2002-08-29 11:47:21 +00:00
|
|
|
if test "$ac_cv_func_vasprintf" != yes; then
|
|
|
|
GNUPG_CHECK_VA_COPY
|
|
|
|
fi
|
|
|
|
|
2004-12-11 15:48:00 +00:00
|
|
|
# Try to find a thread-safe version of ttyname().
|
|
|
|
AC_REPLACE_FUNCS(ttyname_r)
|
|
|
|
if test "$ac_cv_func_ttyname_r" != yes; then
|
|
|
|
AC_MSG_WARN([
|
|
|
|
***
|
|
|
|
*** ttyname() is not thread-safe and ttyname_r() does not exist
|
|
|
|
***])
|
|
|
|
fi
|
|
|
|
|
2003-09-13 17:45:04 +00:00
|
|
|
# Try to find a thread-safe version of getenv().
|
|
|
|
have_thread_safe_getenv=no
|
|
|
|
jm_GLIBC21
|
|
|
|
if test $GLIBC21 = yes; then
|
|
|
|
have_thread_safe_getenv=yes
|
|
|
|
fi
|
|
|
|
if test $have_thread_safe_getenv = yes; then
|
|
|
|
AC_DEFINE(HAVE_THREAD_SAFE_GETENV, [1], [Define if getenv() is thread-safe])
|
|
|
|
fi
|
|
|
|
have_getenv_r=no
|
|
|
|
AC_CHECK_FUNCS(getenv_r, have_getenv_r=yes)
|
|
|
|
if test $have_getenv_r = no && test $have_thread_safe_getenv = no; then
|
2003-11-19 15:15:11 +00:00
|
|
|
AC_MSG_WARN([
|
|
|
|
***
|
|
|
|
*** getenv() is not thread-safe and getenv_r() does not exist
|
|
|
|
***])
|
|
|
|
fi
|
|
|
|
|
|
|
|
# For converting time strings to seconds since Epoch, we need the timegm
|
|
|
|
# function.
|
|
|
|
AC_CHECK_FUNCS(timegm)
|
|
|
|
if test "$ac_cv_func_timegm" != yes; then
|
|
|
|
AC_MSG_WARN([
|
|
|
|
***
|
|
|
|
*** timegm() not available - a non-thread-safe kludge will be used
|
|
|
|
*** and the TZ variable might be changed at runtime.
|
|
|
|
***])
|
2003-09-13 17:45:04 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Checking for libgpg-error.
|
2007-01-08 12:05:07 +00:00
|
|
|
AM_PATH_GPG_ERROR(1.4,, AC_MSG_ERROR([libgpg-error was not found]))
|
2003-06-05 23:20:29 +00:00
|
|
|
AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME,
|
|
|
|
[The default error source for GPGME.])
|
2000-10-27 14:55:24 +00:00
|
|
|
|
2009-10-20 15:39:15 +00:00
|
|
|
# And for libassuan.
|
|
|
|
NEED_LIBASSUAN_VERSION=1.1.0
|
|
|
|
have_libassuan=no
|
|
|
|
AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_VERSION",
|
|
|
|
have_libassuan=yes, have_libassuan=no)
|
|
|
|
AM_CONDITIONAL(HAVE_ASSUAN, test "$have_libassuan" = "yes")
|
|
|
|
if test "$have_libassuan" = "yes"; then
|
|
|
|
AC_DEFINE(ENABLE_ASSUAN,1,[Whether Assuan support is enabled])
|
|
|
|
fi
|
2003-09-13 17:45:04 +00:00
|
|
|
|
2003-08-18 19:17:08 +00:00
|
|
|
# Checks for system services
|
2009-10-26 18:52:32 +00:00
|
|
|
NEED_GPG_VERSION_DEFAULT=1.4.0
|
2007-01-05 17:16:03 +00:00
|
|
|
NEED_GPGSM_VERSION_DEFAULT=1.9.6
|
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
NEED_GPGCONF_VERSION_DEFAULT=2.0.4
|
2009-10-22 16:44:07 +00:00
|
|
|
NEED_G13_VERSION_DEFAULT=2.1.0
|
2007-01-05 17:16:03 +00:00
|
|
|
NEED_GPG_VERSION="$NEED_GPG_VERSION_DEFAULT"
|
|
|
|
NEED_GPGSM_VERSION="$NEED_GPGSM_VERSION_DEFAULT"
|
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
NEED_GPGCONF_VERSION="$NEED_GPGCONF_VERSION_DEFAULT"
|
2009-10-22 16:44:07 +00:00
|
|
|
NEED_G13_VERSION="$NEED_G13_VERSION_DEFAULT"
|
2007-01-05 17:16:03 +00:00
|
|
|
AC_ARG_WITH(gpg-version,
|
|
|
|
AC_HELP_STRING([--with-gpg-version=VER], [require GnuPG version VER]),
|
|
|
|
NEED_GPG_VERSION=$withval)
|
|
|
|
if test "$NEED_GPG_VERSION" = "yes"; then
|
|
|
|
NEED_GPG_VERSION="$NEED_GPG_VERSION_DEFAULT"
|
|
|
|
fi
|
|
|
|
if test "$NEED_GPG_VERSION" = "no"; then
|
|
|
|
NEED_GPG_VERSION=0.0.0
|
|
|
|
fi
|
|
|
|
AC_ARG_WITH(gpgsm-version,
|
|
|
|
AC_HELP_STRING([--with-gpgsm-version=VER], [require GPGSM version VER]),
|
|
|
|
NEED_GPGSM_VERSION=$withval)
|
|
|
|
if test "$NEED_GPGSM_VERSION" = "yes"; then
|
|
|
|
NEED_GPGSM_VERSION="$NEED_GPGSM_VERSION_DEFAULT"
|
|
|
|
fi
|
|
|
|
if test "$NEED_GPGSM_VERSION" = "no"; then
|
|
|
|
NEED_GPGSM_VERSION=0.0.0
|
|
|
|
fi
|
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
AC_ARG_WITH(gpgconf-version,
|
|
|
|
AC_HELP_STRING([--with-gpgconf-version=VER], [require GPGCONF version VER]),
|
|
|
|
NEED_GPGCONF_VERSION=$withval)
|
|
|
|
if test "$NEED_GPGCONF_VERSION" = "yes"; then
|
|
|
|
NEED_GPGCONF_VERSION="$NEED_GPGCONF_VERSION_DEFAULT"
|
|
|
|
fi
|
|
|
|
if test "$NEED_GPGCONF_VERSION" = "no"; then
|
|
|
|
NEED_GPGCONF_VERSION=0.0.0
|
|
|
|
fi
|
2009-10-22 16:44:07 +00:00
|
|
|
AC_ARG_WITH(g13-version,
|
|
|
|
AC_HELP_STRING([--with-g13-version=VER], [require G13 version VER]),
|
|
|
|
NEED_G13_VERSION=$withval)
|
|
|
|
if test "$NEED_G13_VERSION" = "yes"; then
|
|
|
|
NEED_G13_VERSION="$NEED_G13_VERSION_DEFAULT"
|
|
|
|
fi
|
|
|
|
if test "$NEED_G13_VERSION" = "no"; then
|
|
|
|
NEED_G13_VERSION=0.0.0
|
|
|
|
fi
|
2007-01-05 17:16:03 +00:00
|
|
|
|
2007-01-10 10:18:05 +00:00
|
|
|
AC_DEFINE_UNQUOTED(NEED_GPG_VERSION, "$NEED_GPG_VERSION",
|
|
|
|
[Min. needed GnuPG version.])
|
|
|
|
AC_DEFINE_UNQUOTED(NEED_GPGSM_VERSION, "$NEED_GPGSM_VERSION",
|
|
|
|
[Min. needed GPGSM version.])
|
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
AC_DEFINE_UNQUOTED(NEED_GPGCONF_VERSION, "$NEED_GPGCONF_VERSION",
|
|
|
|
[Min. needed GPGCONF version.])
|
2009-10-22 16:44:07 +00:00
|
|
|
AC_DEFINE_UNQUOTED(NEED_G13_VERSION, "$NEED_G13_VERSION",
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
[Min. needed G13 version.])
|
2007-01-10 10:18:05 +00:00
|
|
|
|
2007-01-05 17:16:03 +00:00
|
|
|
|
2001-11-18 03:31:31 +00:00
|
|
|
NO_OVERRIDE=no
|
|
|
|
AC_ARG_WITH(gpg,
|
|
|
|
AC_HELP_STRING([--with-gpg=PATH], [use GnuPG binary at PATH]),
|
|
|
|
GPG=$withval, NO_OVERRIDE=yes)
|
|
|
|
if test "$NO_OVERRIDE" = "yes" || test "$GPG" = "yes"; then
|
|
|
|
GPG=
|
|
|
|
NO_OVERRIDE=yes
|
|
|
|
if test "$cross_compiling" != "yes"; then
|
|
|
|
AC_PATH_PROG(GPG, gpg)
|
|
|
|
fi
|
2000-11-23 15:28:15 +00:00
|
|
|
if test -z "$GPG"; then
|
2001-11-18 03:31:31 +00:00
|
|
|
GPG="$GPG_DEFAULT"
|
2000-11-23 15:28:15 +00:00
|
|
|
fi
|
2000-11-17 21:20:53 +00:00
|
|
|
fi
|
2001-11-18 03:31:31 +00:00
|
|
|
if test "$GPG" = no; then
|
|
|
|
if test "$NO_OVERRIDE" = "yes"; then
|
|
|
|
if test "$cross_compiling" != "yes"; then
|
2003-11-19 15:15:11 +00:00
|
|
|
AC_MSG_WARN([
|
|
|
|
***
|
|
|
|
*** Could not find GnuPG, install GnuPG or use --with-gpg=PATH to enable it
|
|
|
|
***])
|
2001-11-18 03:31:31 +00:00
|
|
|
else
|
2003-11-19 15:15:11 +00:00
|
|
|
AC_MSG_ERROR([
|
|
|
|
***
|
|
|
|
*** Can not determine path to GnuPG when cross-compiling, use --with-gpg=PATH
|
|
|
|
***])
|
2001-11-18 03:31:31 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
2002-04-04 23:31:11 +00:00
|
|
|
AC_DEFINE_UNQUOTED(GPG_PATH, "$GPG", [Path to the GnuPG binary.])
|
2001-12-14 15:35:29 +00:00
|
|
|
AC_SUBST(GPG)
|
2001-11-18 03:31:31 +00:00
|
|
|
fi
|
2004-09-14 19:27:46 +00:00
|
|
|
dnl Check for GnuPG version requirement.
|
|
|
|
GPG_VERSION=unknown
|
2004-09-14 19:47:50 +00:00
|
|
|
ok=maybe
|
|
|
|
if test -z "$GPG" -o "x$GPG" = "xno"; then
|
|
|
|
ok=no
|
|
|
|
else
|
|
|
|
if test "$cross_compiling" = "yes"; then
|
|
|
|
AC_MSG_WARN([GnuPG version can not be checked when cross compiling])
|
|
|
|
ok=no
|
|
|
|
else
|
|
|
|
if test ! -x "$GPG"; then
|
|
|
|
AC_MSG_WARN([GnuPG not executable, version check disabled])
|
|
|
|
ok=no
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$ok" = "maybe"; then
|
2007-01-26 12:08:12 +00:00
|
|
|
AC_MSG_CHECKING(for GPG >= $NEED_GPG_VERSION)
|
2004-09-14 19:27:46 +00:00
|
|
|
req_major=`echo $NEED_GPG_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
|
|
|
req_minor=`echo $NEED_GPG_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
|
|
|
req_micro=`echo $NEED_GPG_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
2007-01-26 12:08:12 +00:00
|
|
|
GPG_VERSION=`$GPG --version | sed -n '1 s/[[^0-9]]*\(.*\)/\1/p'`
|
|
|
|
major=`echo $GPG_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
|
|
|
minor=`echo $GPG_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
|
|
|
micro=`echo $GPG_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
|
2004-09-14 19:27:46 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
if test "$ok" = "yes"; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
else
|
2004-09-14 19:47:50 +00:00
|
|
|
AC_MSG_RESULT(no)
|
2007-01-26 12:08:12 +00:00
|
|
|
AC_MSG_WARN([GPG must be at least version $NEED_GPG_VERSION])
|
2004-09-14 19:27:46 +00:00
|
|
|
fi
|
|
|
|
fi
|
2007-01-26 12:08:12 +00:00
|
|
|
run_gpg_test="$ok"
|
|
|
|
AC_ARG_ENABLE(gpg-test,
|
|
|
|
AC_HELP_STRING([--disable-gpg-test], [disable GPG run test]),
|
|
|
|
run_gpg_test=$enableval)
|
|
|
|
AM_CONDITIONAL(RUN_GPG_TESTS, test "$run_gpg_test" = "yes")
|
2001-12-14 15:35:29 +00:00
|
|
|
AC_SUBST(GPG_PATH)
|
2001-11-18 03:31:31 +00:00
|
|
|
|
|
|
|
NO_OVERRIDE=no
|
|
|
|
AC_ARG_WITH(gpgsm,
|
|
|
|
AC_HELP_STRING([--with-gpgsm=PATH], [use GpgSM binary at PATH]),
|
|
|
|
GPGSM=$withval, NO_OVERRIDE=yes)
|
|
|
|
if test "$NO_OVERRIDE" = "yes" || test "$GPGSM" = "yes"; then
|
|
|
|
GPGSM=
|
|
|
|
NO_OVERRIDE=yes
|
|
|
|
if test "$cross_compiling" != "yes"; then
|
|
|
|
AC_PATH_PROG(GPGSM, gpgsm)
|
|
|
|
fi
|
|
|
|
if test -z "$GPGSM"; then
|
|
|
|
GPGSM="$GPGSM_DEFAULT"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$GPGSM" = no; then
|
|
|
|
if test "$NO_OVERRIDE" = "yes"; then
|
|
|
|
if test "$cross_compiling" != "yes"; then
|
2003-11-19 15:15:11 +00:00
|
|
|
AC_MSG_WARN([
|
|
|
|
***
|
|
|
|
*** Could not find GpgSM, install GpgSM or use --with-gpgsm=PATH to enable it
|
|
|
|
***])
|
2001-11-18 03:31:31 +00:00
|
|
|
else
|
2003-11-19 15:15:11 +00:00
|
|
|
AC_MSG_ERROR([
|
|
|
|
***
|
|
|
|
*** Can not determine path to GpgSM when cross-compiling, use --with-gpgsm=PATH
|
|
|
|
***])
|
2001-11-18 03:31:31 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
2002-04-04 23:31:11 +00:00
|
|
|
AC_DEFINE_UNQUOTED(GPGSM_PATH, "$GPGSM", [Path to the GPGSM binary.])
|
2005-08-19 16:11:46 +00:00
|
|
|
AC_DEFINE(ENABLE_GPGSM,1,[Whether GPGSM support is enabled])
|
2001-11-18 03:31:31 +00:00
|
|
|
fi
|
2004-12-07 15:27:11 +00:00
|
|
|
AM_CONDITIONAL(HAVE_GPGSM, test "$GPGSM" != "no")
|
2005-08-19 16:11:46 +00:00
|
|
|
|
|
|
|
|
2004-09-14 19:27:46 +00:00
|
|
|
dnl Check for GPGSM version requirement.
|
|
|
|
GPGSM_VERSION=unknown
|
2004-09-14 19:47:50 +00:00
|
|
|
ok=maybe
|
|
|
|
if test -z "$GPGSM" -o "x$GPGSM" = "xno"; then
|
|
|
|
ok=no
|
|
|
|
else
|
|
|
|
if test "$cross_compiling" = "yes"; then
|
|
|
|
AC_MSG_WARN([GPGSM version can not be checked when cross compiling])
|
|
|
|
ok=no
|
|
|
|
else
|
|
|
|
if test ! -x "$GPGSM"; then
|
|
|
|
AC_MSG_WARN([GPGSM not executable, version check disabled])
|
|
|
|
ok=no
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$ok" = "maybe"; then
|
2004-09-14 19:27:46 +00:00
|
|
|
AC_MSG_CHECKING(for GPGSM >= $NEED_GPGSM_VERSION)
|
|
|
|
req_major=`echo $NEED_GPGSM_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
|
|
|
req_minor=`echo $NEED_GPGSM_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
|
|
|
req_micro=`echo $NEED_GPGSM_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
2007-01-26 12:08:12 +00:00
|
|
|
GPGSM_VERSION=`$GPGSM --version | sed -n '1 s/[[^0-9]]*\(.*\)/\1/p'`
|
|
|
|
major=`echo $GPGSM_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
|
|
|
minor=`echo $GPGSM_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
|
|
|
micro=`echo $GPGSM_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
|
2004-09-14 19:27:46 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
if test "$ok" = "yes"; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
else
|
2004-09-14 19:47:50 +00:00
|
|
|
AC_MSG_RESULT(no)
|
2004-09-14 19:27:46 +00:00
|
|
|
AC_MSG_WARN([GPGSM must be at least version $NEED_GPGSM_VERSION])
|
|
|
|
fi
|
|
|
|
fi
|
2007-01-26 12:08:12 +00:00
|
|
|
run_gpgsm_test="$ok"
|
|
|
|
AC_ARG_ENABLE(gpgsm-test,
|
|
|
|
AC_HELP_STRING([--disable-gpgsm-test], [disable GPGSM run test]),
|
|
|
|
run_gpgsm_test=$enableval)
|
|
|
|
AM_CONDITIONAL(RUN_GPGSM_TESTS, test "$run_gpgsm_test" = "yes")
|
|
|
|
|
2009-10-20 15:39:15 +00:00
|
|
|
# Require libassuan if GPGSM is here.
|
|
|
|
require_libassuan=no
|
|
|
|
if test "$GPGSM" != "no"; then
|
|
|
|
require_libassuan=yes
|
|
|
|
fi
|
2009-10-22 16:44:07 +00:00
|
|
|
if test "$G13" != "no"; then
|
|
|
|
require_libassuan=yes
|
|
|
|
fi
|
2009-10-20 15:39:15 +00:00
|
|
|
|
2000-12-06 12:17:10 +00:00
|
|
|
|
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
NO_OVERRIDE=no
|
|
|
|
AC_ARG_WITH(gpgconf,
|
|
|
|
AC_HELP_STRING([--with-gpgconf=PATH],
|
|
|
|
[use gpgconf binary at PATH]),
|
|
|
|
GPGCONF=$withval, NO_OVERRIDE=yes)
|
|
|
|
if test "$NO_OVERRIDE" = "yes" || test "$GPGCONF" = "yes"; then
|
|
|
|
GPGCONF=
|
|
|
|
NO_OVERRIDE=yes
|
|
|
|
if test "$cross_compiling" != "yes"; then
|
|
|
|
AC_PATH_PROG(GPGCONF, gpgconf)
|
|
|
|
fi
|
|
|
|
if test -z "$GPGCONF"; then
|
|
|
|
GPGCONF="$GPGCONF_DEFAULT"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$GPGCONF" = no; then
|
|
|
|
if test "$NO_OVERRIDE" = "yes"; then
|
|
|
|
if test "$cross_compiling" != "yes"; then
|
|
|
|
AC_MSG_WARN([
|
|
|
|
***
|
|
|
|
*** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it
|
|
|
|
***])
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR([
|
|
|
|
***
|
|
|
|
*** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH
|
|
|
|
***])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
AC_DEFINE_UNQUOTED(GPGCONF_PATH, "$GPGCONF", [Path to the GPGCONF binary.])
|
|
|
|
AC_DEFINE(ENABLE_GPGCONF,1,[Whether GPGCONF support is enabled])
|
|
|
|
fi
|
|
|
|
AM_CONDITIONAL(HAVE_GPGCONF, test "$GPGCONF" != "no")
|
|
|
|
|
|
|
|
dnl Check for GPGCONF version requirement.
|
|
|
|
GPGCONF_VERSION=unknown
|
|
|
|
ok=maybe
|
|
|
|
if test -z "$GPGCONF" -o "x$GPGCONF" = "xno"; then
|
|
|
|
ok=no
|
|
|
|
else
|
|
|
|
if test "$cross_compiling" = "yes"; then
|
|
|
|
AC_MSG_WARN([GPGCONF version can not be checked when cross compiling])
|
|
|
|
ok=no
|
|
|
|
else
|
|
|
|
if test ! -x "$GPGCONF"; then
|
|
|
|
AC_MSG_WARN([GPGCONF not executable, version check disabled])
|
|
|
|
ok=no
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$ok" = "maybe"; then
|
|
|
|
AC_MSG_CHECKING(for GPGCONF >= $NEED_GPGCONF_VERSION)
|
|
|
|
req_major=`echo $NEED_GPGCONF_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
|
|
|
req_minor=`echo $NEED_GPGCONF_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
|
|
|
req_micro=`echo $NEED_GPGCONF_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
|
|
|
GPGCONF_VERSION=`$GPGCONF --version | sed -n '1 s/[[^0-9]]*\(.*\)/\1/p'`
|
|
|
|
major=`echo $GPGCONF_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
|
|
|
minor=`echo $GPGCONF_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
|
|
|
micro=`echo $GPGCONF_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
|
|
|
|
if test "$ok" = "yes"; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_MSG_WARN([GPGCONF must be at least version $NEED_GPGCONF_VERSION])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
run_gpgconf_test="$ok"
|
|
|
|
AC_ARG_ENABLE(gpgconf-test,
|
|
|
|
AC_HELP_STRING([--disable-gpgconf-test], [disable GPGCONF run test]),
|
|
|
|
run_gpgconf_test=$enableval)
|
|
|
|
AM_CONDITIONAL(RUN_GPGCONF_TESTS, test "$run_gpgconf_test" = "yes")
|
|
|
|
|
|
|
|
|
2009-10-22 16:44:07 +00:00
|
|
|
NO_OVERRIDE=no
|
|
|
|
AC_ARG_WITH(g13,
|
|
|
|
AC_HELP_STRING([--with-g13=PATH],
|
|
|
|
[use g13 binary at PATH]),
|
|
|
|
G13=$withval, NO_OVERRIDE=yes)
|
|
|
|
if test "$NO_OVERRIDE" = "yes" || test "$G13" = "yes"; then
|
|
|
|
G13=
|
|
|
|
NO_OVERRIDE=yes
|
|
|
|
if test "$cross_compiling" != "yes"; then
|
|
|
|
AC_PATH_PROG(G13, g13)
|
|
|
|
fi
|
|
|
|
if test -z "$G13"; then
|
|
|
|
G13="$G13_DEFAULT"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$G13" = no; then
|
|
|
|
if test "$NO_OVERRIDE" = "yes"; then
|
|
|
|
if test "$cross_compiling" != "yes"; then
|
|
|
|
AC_MSG_WARN([
|
|
|
|
***
|
|
|
|
*** Could not find g13, install g13 or use --with-g13=PATH to enable it
|
|
|
|
***])
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR([
|
|
|
|
***
|
|
|
|
*** Can not determine path to g13 when cross-compiling, use --with-g13=PATH
|
|
|
|
***])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
AC_DEFINE_UNQUOTED(G13_PATH, "$G13", [Path to the G13 binary.])
|
|
|
|
AC_DEFINE(ENABLE_G13,1,[Whether G13 support is enabled])
|
|
|
|
fi
|
|
|
|
AM_CONDITIONAL(HAVE_G13, test "$G13" != "no")
|
|
|
|
|
|
|
|
dnl Check for G13 version requirement.
|
|
|
|
G13_VERSION=unknown
|
|
|
|
ok=maybe
|
|
|
|
if test -z "$G13" -o "x$G13" = "xno"; then
|
|
|
|
ok=no
|
|
|
|
else
|
|
|
|
if test "$cross_compiling" = "yes"; then
|
|
|
|
AC_MSG_WARN([G13 version can not be checked when cross compiling])
|
|
|
|
ok=no
|
|
|
|
else
|
|
|
|
if test ! -x "$G13"; then
|
|
|
|
AC_MSG_WARN([G13 not executable, version check disabled])
|
|
|
|
ok=no
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$ok" = "maybe"; then
|
|
|
|
AC_MSG_CHECKING(for G13 >= $NEED_G13_VERSION)
|
|
|
|
req_major=`echo $NEED_G13_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
|
|
|
req_minor=`echo $NEED_G13_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
|
|
|
req_micro=`echo $NEED_G13_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
|
|
|
G13_VERSION=`$G13 --version | sed -n '1 s/.*\ \([[0-9]].*\)/\1/p'`
|
|
|
|
major=`echo $G13_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
|
|
|
minor=`echo $G13_VERSION | \
|
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
|
|
|
micro=`echo $G13_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
|
|
|
|
if test "$ok" = "yes"; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_MSG_WARN([G13 must be at least version $NEED_G13_VERSION])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
run_g13_test="$ok"
|
|
|
|
AC_ARG_ENABLE(g13-test,
|
|
|
|
AC_HELP_STRING([--disable-g13-test], [disable G13 run test]),
|
|
|
|
run_g13_test=$enableval)
|
|
|
|
AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes")
|
|
|
|
|
|
|
|
|
2007-07-08 15:46:10 +00:00
|
|
|
# Check for funopen
|
2004-02-18 18:05:38 +00:00
|
|
|
AC_CHECK_FUNCS(funopen)
|
|
|
|
if test $ac_cv_func_funopen != yes; then
|
2003-08-18 19:17:08 +00:00
|
|
|
# No funopen but we can implement that in terms of fopencookie.
|
2004-02-10 10:10:40 +00:00
|
|
|
AC_CHECK_FUNCS(fopencookie)
|
2004-02-06 15:45:44 +00:00
|
|
|
if test $ac_cv_func_fopencookie = yes; then
|
2007-07-08 15:46:10 +00:00
|
|
|
AC_REPLACE_FUNCS(funopen)
|
2004-02-06 15:45:44 +00:00
|
|
|
else
|
2004-02-18 18:05:38 +00:00
|
|
|
AC_MSG_WARN([
|
|
|
|
***
|
|
|
|
*** No implementation of fopencookie or funopen available
|
|
|
|
***])
|
2004-02-06 15:45:44 +00:00
|
|
|
fi
|
2003-08-18 19:17:08 +00:00
|
|
|
fi
|
|
|
|
|
2009-12-10 09:49:47 +00:00
|
|
|
# Check for getgid etc
|
|
|
|
AC_CHECK_FUNCS(getgid getegid)
|
|
|
|
|
|
|
|
|
2009-10-20 15:39:15 +00:00
|
|
|
# Replacement functions.
|
2006-09-19 14:01:54 +00:00
|
|
|
AC_REPLACE_FUNCS(stpcpy)
|
|
|
|
# Check for unistd.h for setenv replacement function.
|
|
|
|
AC_CHECK_HEADERS(unistd.h)
|
|
|
|
AC_REPLACE_FUNCS(setenv)
|
2004-02-18 18:05:38 +00:00
|
|
|
|
2006-12-02 23:58:35 +00:00
|
|
|
# Assuan check for descriptor passing.
|
|
|
|
AC_CHECK_MEMBER(struct cmsghdr.cmsg_len,
|
2006-12-03 02:00:43 +00:00
|
|
|
[supports_descriptor_passing=yes],
|
|
|
|
[supports_descriptor_passing=no
|
2006-12-02 23:58:35 +00:00
|
|
|
AC_MSG_WARN([
|
|
|
|
***
|
|
|
|
*** Data structure for sending ancillary data missing.
|
|
|
|
*** Descriptor passing won't work.
|
|
|
|
***])],[
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/un.h>
|
|
|
|
#if HAVE_SYS_UIO_H
|
|
|
|
#include <sys/uio.h>
|
|
|
|
#endif
|
|
|
|
#include <unistd.h>
|
|
|
|
])
|
2006-12-03 02:00:43 +00:00
|
|
|
|
|
|
|
AC_ARG_ENABLE(fd-passing,
|
|
|
|
AC_HELP_STRING([--enable-fd-passing], [use FD passing if supported]),
|
2006-12-17 21:12:40 +00:00
|
|
|
use_descriptor_passing=$enableval)
|
2006-12-03 02:00:43 +00:00
|
|
|
|
|
|
|
if test "$supports_descriptor_passing" != "yes"; then
|
|
|
|
use_descriptor_passing=no
|
|
|
|
fi
|
|
|
|
|
2006-12-02 23:58:35 +00:00
|
|
|
if test "$use_descriptor_passing" = "yes"; then
|
2007-07-08 15:46:10 +00:00
|
|
|
AC_DEFINE(USE_DESCRIPTOR_PASSING,1,
|
|
|
|
[Defined if descriptor passing is enabled and supported])
|
2006-12-02 23:58:35 +00:00
|
|
|
fi
|
2006-12-03 02:00:43 +00:00
|
|
|
|
2006-12-02 23:58:35 +00:00
|
|
|
AM_CONDITIONAL(USE_DESCRIPTOR_PASSING, test "$use_descriptor_passing" = "yes")
|
|
|
|
|
2003-08-18 19:17:08 +00:00
|
|
|
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
uiserver=no
|
|
|
|
if test "$use_descriptor_passing" = "yes" && test "$have_libassuan" = "yes"; then
|
|
|
|
uiserver=yes
|
|
|
|
fi
|
|
|
|
if test "$uiserver" != "no"; then
|
|
|
|
AC_DEFINE(ENABLE_UISERVER, 1,
|
|
|
|
[Defined if we are building with uiserver support.])
|
|
|
|
fi
|
|
|
|
AM_CONDITIONAL(HAVE_UISERVER, test "$uiserver" != "no")
|
|
|
|
|
|
|
|
|
2000-12-06 12:17:10 +00:00
|
|
|
AM_CONDITIONAL(BUILD_COMPLUS, test "$component_system" = "COM+")
|
|
|
|
|
2005-08-19 16:11:46 +00:00
|
|
|
# Generate values for the DLL version info
|
|
|
|
if test "$have_w32_system" = yes; then
|
|
|
|
BUILD_TIMESTAMP=`date --iso-8601=minutes`
|
|
|
|
changequote(,)dnl
|
|
|
|
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
|
|
|
|
changequote([,])dnl
|
2005-11-18 16:52:38 +00:00
|
|
|
BUILD_FILEVERSION="${BUILD_FILEVERSION}${BUILD_REVISION}"
|
2005-08-19 16:11:46 +00:00
|
|
|
fi
|
2005-11-18 16:52:38 +00:00
|
|
|
AC_SUBST(BUILD_REVISION)
|
2005-08-19 16:11:46 +00:00
|
|
|
AC_SUBST(BUILD_TIMESTAMP)
|
|
|
|
AC_SUBST(BUILD_FILEVERSION)
|
|
|
|
|
2005-08-26 12:38:57 +00:00
|
|
|
# Add a few constants to help porting to W32
|
|
|
|
AH_VERBATIM([SEPCONSTANTS],
|
|
|
|
[
|
2007-07-08 15:46:10 +00:00
|
|
|
/* Separators as used in $PATH. */
|
2005-08-26 12:38:57 +00:00
|
|
|
#ifdef HAVE_DOSISH_SYSTEM
|
|
|
|
#define PATHSEP_C ';'
|
|
|
|
#else
|
|
|
|
#define PATHSEP_C ':'
|
|
|
|
#endif
|
|
|
|
])
|
|
|
|
|
2006-01-05 08:58:50 +00:00
|
|
|
AH_BOTTOM([
|
|
|
|
/* Definition of GCC specific attributes. */
|
|
|
|
#if __GNUC__ > 2
|
|
|
|
# define GPGME_GCC_A_PURE __attribute__ ((__pure__))
|
|
|
|
#else
|
|
|
|
# define GPGME_GCC_A_PURE
|
|
|
|
#endif
|
|
|
|
])
|
|
|
|
|
2005-08-19 16:11:46 +00:00
|
|
|
|
2003-08-20 20:20:46 +00:00
|
|
|
# Substitution used for gpgme-config
|
2002-08-23 19:48:43 +00:00
|
|
|
GPGME_CONFIG_LIBS="-lgpgme"
|
|
|
|
GPGME_CONFIG_CFLAGS=""
|
2004-05-21 19:49:38 +00:00
|
|
|
AC_SUBST(GPGME_CONFIG_API_VERSION)
|
2002-08-23 19:48:43 +00:00
|
|
|
AC_SUBST(GPGME_CONFIG_LIBS)
|
|
|
|
AC_SUBST(GPGME_CONFIG_CFLAGS)
|
2000-10-27 14:55:24 +00:00
|
|
|
|
2003-08-20 20:20:46 +00:00
|
|
|
# Frob'da Variables
|
2002-09-02 13:01:44 +00:00
|
|
|
LTLIBOBJS=`echo "$LIB@&t@OBJS" |
|
|
|
|
sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
|
|
|
|
AC_SUBST(LTLIBOBJS)
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
# Some checks for gpgme-tool
|
|
|
|
AC_CHECK_HEADER([argp.h])
|
|
|
|
AC_CHECK_TYPES([error_t], [],
|
|
|
|
[AC_DEFINE([error_t], [int],
|
|
|
|
[Define to a type to use for `error_t' if it is not otherwise available.])],
|
|
|
|
[#include <errno.h>])
|
|
|
|
|
|
|
|
|
2009-10-20 15:39:15 +00:00
|
|
|
# Last check.
|
|
|
|
die=no
|
|
|
|
if test "$require_libassuan" = "no"; then
|
|
|
|
die=yes
|
|
|
|
AC_MSG_NOTICE([[
|
|
|
|
***
|
|
|
|
*** You need libassuan to build this program with GPGSM support.
|
|
|
|
*** This library is for example available at
|
|
|
|
*** ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/
|
|
|
|
*** (at least version $NEED_LIBASSUAN_VERSION is required).
|
|
|
|
***]])
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$die" = "yes"; then
|
|
|
|
AC_MSG_ERROR([[
|
|
|
|
***
|
|
|
|
*** Required libraries not found. Please consult the above messages
|
|
|
|
*** and install them before running configure again.
|
|
|
|
***]])
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
2003-08-20 20:20:46 +00:00
|
|
|
#
|
|
|
|
# Create config files
|
2002-01-22 16:34:52 +00:00
|
|
|
|
2009-10-20 16:04:06 +00:00
|
|
|
AC_CONFIG_FILES(Makefile src/Makefile
|
2009-01-26 10:21:10 +00:00
|
|
|
tests/Makefile
|
|
|
|
tests/gpg/Makefile
|
|
|
|
tests/gpgsm/Makefile
|
|
|
|
tests/opassuan/Makefile
|
2005-08-19 16:11:46 +00:00
|
|
|
doc/Makefile complus/Makefile
|
2008-11-03 17:24:09 +00:00
|
|
|
src/versioninfo.rc
|
|
|
|
src/gpgme.h)
|
|
|
|
AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
|
2006-07-06 10:37:52 +00:00
|
|
|
AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
|
2001-11-18 03:31:31 +00:00
|
|
|
AC_OUTPUT
|
2000-10-27 14:55:24 +00:00
|
|
|
|
2000-12-06 12:17:10 +00:00
|
|
|
echo "
|
|
|
|
GPGME v${VERSION} has been configured as follows:
|
|
|
|
|
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
GnuPG path: $GPG
|
|
|
|
GnuPG version: $GPG_VERSION, min. $NEED_GPG_VERSION
|
|
|
|
|
|
|
|
GpgSM path: $GPGSM
|
|
|
|
GpgSM version: $GPGSM_VERSION, min. $NEED_GPGSM_VERSION
|
2001-11-18 03:31:31 +00:00
|
|
|
|
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
GpgConf path: $GPGCONF
|
|
|
|
GpgConf version: $GPGCONF_VERSION, min. $NEED_GPGCONF_VERSION
|
2004-09-14 19:27:46 +00:00
|
|
|
|
2009-10-22 16:44:07 +00:00
|
|
|
G13 path: $G13
|
|
|
|
G13 version: $G13_VERSION, min. $NEED_G13_VERSION
|
|
|
|
|
2009-10-20 15:39:15 +00:00
|
|
|
Assuan version: $LIBASSUAN_VERSION
|
|
|
|
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
UI Server: $uiserver
|
|
|
|
FD Passing: $use_descriptor_passing
|
|
|
|
|
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
GPGME Pthread: $have_pthread
|
|
|
|
GPGME Pth: $have_pth
|
2000-12-06 12:17:10 +00:00
|
|
|
"
|