2007-05-07 19:49:12 +00:00
|
|
|
# configure.ac - for GnuPG 2.0
|
2007-03-08 14:16:15 +00:00
|
|
|
# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
|
2011-01-11 19:49:08 +01:00
|
|
|
# 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
|
2011-07-07 11:20:53 +02:00
|
|
|
#
|
2002-10-19 07:55:27 +00:00
|
|
|
# This file is part of GnuPG.
|
2011-07-07 11:20:53 +02:00
|
|
|
#
|
2002-10-19 07:55:27 +00:00
|
|
|
# GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
2007-07-04 19:49:40 +00:00
|
|
|
# the Free Software Foundation; either version 3 of the License, or
|
2002-10-19 07:55:27 +00:00
|
|
|
# (at your option) any later version.
|
2011-07-07 11:20:53 +02:00
|
|
|
#
|
2002-10-19 07:55:27 +00:00
|
|
|
# GnuPG 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 General Public License for more details.
|
2011-07-07 11:20:53 +02:00
|
|
|
#
|
2002-10-19 07:55:27 +00:00
|
|
|
# You should have received a copy of the GNU General Public License
|
2007-07-04 19:49:40 +00:00
|
|
|
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2002-10-19 07:55:27 +00:00
|
|
|
|
|
|
|
# Process this file with autoconf to produce a configure script.
|
2007-05-07 19:49:12 +00:00
|
|
|
AC_PREREQ(2.61)
|
2007-05-04 12:04:26 +00:00
|
|
|
min_automake_version="1.10"
|
2003-12-09 09:12:43 +00:00
|
|
|
|
2005-11-28 11:52:25 +00:00
|
|
|
# Remember to change the version number immediately *after* a release.
|
2006-04-19 11:26:11 +00:00
|
|
|
# Set my_issvn to "yes" for non-released code. Remember to run an
|
|
|
|
# "svn up" and "autogen.sh" right before creating a distribution.
|
2011-01-13 17:04:47 +01:00
|
|
|
m4_define([my_version], [2.0.18])
|
|
|
|
m4_define([my_issvn], [yes])
|
2009-01-12 09:18:27 +00:00
|
|
|
|
2008-08-27 17:01:29 +00:00
|
|
|
m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
|
|
|
|
| sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
|
2011-01-10 15:18:09 +01:00
|
|
|
m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
|
|
|
|
| awk '/^\* / {printf "%s",$3}']))
|
2011-08-04 11:36:52 +02:00
|
|
|
m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes],
|
|
|
|
[m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
|
|
|
|
|
|
|
|
AC_INIT([gnupg],[my_full_version],[http://bugs.gnupg.org])
|
2003-06-18 19:56:13 +00:00
|
|
|
# Set development_version to yes if the minor number is odd or you
|
|
|
|
# feel that the default check for a development version is not
|
|
|
|
# sufficient.
|
2006-11-11 14:17:09 +00:00
|
|
|
development_version=no
|
2006-08-16 10:47:53 +00:00
|
|
|
|
2010-07-19 07:05:30 +00:00
|
|
|
NEED_GPG_ERROR_VERSION=1.7
|
2004-03-06 20:11:19 +00:00
|
|
|
|
|
|
|
NEED_LIBGCRYPT_API=1
|
2008-09-29 15:02:55 +00:00
|
|
|
NEED_LIBGCRYPT_VERSION=1.4.0
|
2004-03-06 20:11:19 +00:00
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
Conflicts:
ChangeLog
agent/ChangeLog
agent/command.c
common/ChangeLog
g10/ChangeLog
scd/ChangeLog
sm/ChangeLog
sm/gpgsm.c
tools/ChangeLog
Somehow this slipped through. Really commit this time.
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* configure.ac: Check for libassuan instead of libassuan-pth.
common/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* Makefile.am (libcommon_a_CFLAGS): Use LIBASSUAN_CFLAGS instead
of LIBASSUAN_PTH_CFLAGS.
scd/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, scdaemon_LDADD: Use libassuan instead of libassuan-pth.
* scdaemon.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
g13/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, g13_LDADD: Use libassuan instead of libassuan-pth.
* g13.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks.
agent/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of
libassuan-pth.
* gpg-agent.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
Fix invocation of assuan_socket_connect.
Conflicts:
ChangeLog
agent/ChangeLog
common/ChangeLog
configure.ac
g13/ChangeLog
g13/Makefile.am
g13/g13.c
scd/ChangeLog
agent/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
common/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
g10/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
scd/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
sm/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
* call-agent.c (membuf_data_cb, default_inq_cb)
(inq_ciphertext_cb, scd_serialno_status_cb)
(scd_keypairinfo_status_cb, istrusted_status_cb)
(learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
Conflicts:
agent/ChangeLog
common/ChangeLog
g10/ChangeLog
g10/server.c
g13/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
Adjust for assuan_register_command change.
Conflicts:
agent/ChangeLog
g10/ChangeLog
g13/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
Add hack for the HELP command.
Conflicts:
tools/ChangeLog
Add help strings for all commands.
Conflicts:
agent/ChangeLog
agent/command.c
Add help strings for all commands.
Conflicts:
scd/ChangeLog
Add help strings for all commands
Conflicts:
sm/ChangeLog
agent/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Call assuan_pipe_connect, not
assuan_pipe_connect_ext.
* command.c (start_command_handler): Change
assuan_init_socket_server_ext into assuan_init_socket_server.
* call-scd.c (start_scd): Update use of assuan_socket_connect and
assuan_pipe_connect.
* gpg-agent.c (check_own_socket_thread, check_for_running_agent):
Update use of assuan_socket_connect.
common/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
scd/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Call assuan_init_socket_server,
not assuan_init_socket_server_ext.
sm/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Update use of
assuan_pipe_connect and assuan_socket_connect.
tools/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (start_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
Conflicts:
agent/ChangeLog
common/ChangeLog
g13/ChangeLog
g13/call-gpg.c
scd/ChangeLog
sm/ChangeLog
tools/ChangeLog
agent/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
scd/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
sm/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* server.c (gpgsm_server): Use assuan_fd_t and assuan_fdopen on
fds.
g10/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.
Conflicts:
agent/ChangeLog
g10/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
2009-11-27 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Do not call
assuan_set_log_stream anymore.
* gpg-agent.c (main): But call assuan_set_assuan_log_stream here.
Conflicts:
agent/ChangeLog
agent/command.c
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing
argument in assuan_socket_connect invocation.
* iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function
declaration.
Conflicts:
common/ChangeLog
common/iobuf.c
common/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD.
agent/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Convert posix fd to assuan fd.
* call-scd.c (start_scd): Likewise.
sm/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Convert posix fd to assuan fd.
tools/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (main): Convert posix fd to assuan fd.
Conflicts:
agent/ChangeLog
common/ChangeLog
g13/call-gpg.c
sm/ChangeLog
tools/ChangeLog
2010-02-12 15:15:34 +00:00
|
|
|
NEED_LIBASSUAN_API=2
|
2010-02-18 09:52:28 +00:00
|
|
|
NEED_LIBASSUAN_VERSION=2.0.0
|
2004-03-06 20:11:19 +00:00
|
|
|
|
2006-09-06 11:53:24 +00:00
|
|
|
NEED_KSBA_API=1
|
2010-07-19 07:05:30 +00:00
|
|
|
NEED_KSBA_VERSION=1.0.7
|
2004-03-06 20:11:19 +00:00
|
|
|
|
|
|
|
|
2002-06-29 14:15:02 +00:00
|
|
|
PACKAGE=$PACKAGE_NAME
|
2004-04-06 10:01:04 +00:00
|
|
|
PACKAGE_GT=${PACKAGE_NAME}2
|
2002-06-29 14:15:02 +00:00
|
|
|
VERSION=$PACKAGE_VERSION
|
|
|
|
|
2002-10-19 09:27:39 +00:00
|
|
|
AC_CONFIG_AUX_DIR(scripts)
|
2002-10-19 07:55:27 +00:00
|
|
|
AC_CONFIG_SRCDIR(sm/gpgsm.c)
|
2002-06-29 14:15:02 +00:00
|
|
|
AM_CONFIG_HEADER(config.h)
|
2002-10-19 07:55:27 +00:00
|
|
|
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
|
2007-08-10 16:52:05 +00:00
|
|
|
AC_CANONICAL_HOST
|
2006-07-27 14:18:55 +00:00
|
|
|
AB_INIT
|
2003-06-18 19:56:13 +00:00
|
|
|
|
|
|
|
AC_GNU_SOURCE
|
2002-06-29 14:15:02 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
# Some status variables.
|
2003-08-18 17:34:28 +00:00
|
|
|
have_gpg_error=no
|
2011-07-07 11:20:53 +02:00
|
|
|
have_libgcrypt=no
|
2003-08-18 17:34:28 +00:00
|
|
|
have_libassuan=no
|
2002-10-19 07:55:27 +00:00
|
|
|
have_ksba=no
|
|
|
|
have_pth=no
|
2006-09-06 11:53:24 +00:00
|
|
|
have_libusb=no
|
2008-04-07 19:31:12 +00:00
|
|
|
have_adns=no
|
2002-06-29 14:15:02 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
use_bzip2=yes
|
|
|
|
use_exec=yes
|
|
|
|
disable_keyserver_path=no
|
2010-03-09 09:55:24 +00:00
|
|
|
use_ccid_driver=yes
|
2010-05-04 09:56:42 +00:00
|
|
|
use_standard_socket=no
|
2006-08-16 10:47:53 +00:00
|
|
|
|
2006-09-14 16:50:33 +00:00
|
|
|
GNUPG_BUILD_PROGRAM(gpg, yes)
|
2002-10-19 07:55:27 +00:00
|
|
|
GNUPG_BUILD_PROGRAM(gpgsm, yes)
|
|
|
|
GNUPG_BUILD_PROGRAM(agent, yes)
|
|
|
|
GNUPG_BUILD_PROGRAM(scdaemon, yes)
|
2006-09-18 13:23:18 +00:00
|
|
|
GNUPG_BUILD_PROGRAM(tools, yes)
|
|
|
|
GNUPG_BUILD_PROGRAM(doc, yes)
|
2005-04-15 01:33:46 +00:00
|
|
|
GNUPG_BUILD_PROGRAM(symcryptrun, no)
|
2011-01-11 19:35:05 +01:00
|
|
|
GNUPG_BUILD_PROGRAM(gpgtar, no)
|
|
|
|
|
2002-06-29 14:15:02 +00:00
|
|
|
|
2002-10-19 07:55:27 +00:00
|
|
|
AC_SUBST(PACKAGE)
|
2004-04-06 10:01:04 +00:00
|
|
|
AC_SUBST(PACKAGE_GT)
|
2002-10-19 07:55:27 +00:00
|
|
|
AC_SUBST(VERSION)
|
|
|
|
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
|
2004-04-06 10:01:04 +00:00
|
|
|
AC_DEFINE_UNQUOTED(PACKAGE_GT, "$PACKAGE_GT",
|
|
|
|
[Name of this package for gettext])
|
2002-10-19 07:55:27 +00:00
|
|
|
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
|
|
|
|
AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",
|
|
|
|
[Bug report address])
|
|
|
|
AC_DEFINE_UNQUOTED(NEED_LIBGCRYPT_VERSION, "$NEED_LIBGCRYPT_VERSION",
|
|
|
|
[Required version of Libgcrypt])
|
|
|
|
AC_DEFINE_UNQUOTED(NEED_KSBA_VERSION, "$NEED_KSBA_VERSION",
|
|
|
|
[Required version of Libksba])
|
2002-06-29 14:15:02 +00:00
|
|
|
|
|
|
|
|
2004-02-12 09:25:30 +00:00
|
|
|
# The default is to use the modules from this package and the few
|
|
|
|
# other packages in a standard place; i.e where this package gets
|
|
|
|
# installed. With these options it is possible to override these
|
|
|
|
# ${prefix} depended values with fixed paths, which can't be replaced
|
|
|
|
# at make time. See also am/cmacros.am and the defaults in AH_BOTTOM.
|
2002-10-19 07:55:27 +00:00
|
|
|
AC_ARG_WITH(agent-pgm,
|
2004-02-12 09:25:30 +00:00
|
|
|
[ --with-agent-pgm=PATH Use PATH as the default for the agent)],
|
|
|
|
GNUPG_AGENT_PGM="$withval", GNUPG_AGENT_PGM="" )
|
|
|
|
AC_SUBST(GNUPG_AGENT_PGM)
|
|
|
|
AM_CONDITIONAL(GNUPG_AGENT_PGM, test -n "$GNUPG_AGENT_PGM")
|
|
|
|
show_gnupg_agent_pgm="(default)"
|
|
|
|
test -n "$GNUPG_AGENT_PGM" && show_gnupg_agent_pgm="$GNUPG_AGENT_PGM"
|
|
|
|
|
2002-10-19 07:55:27 +00:00
|
|
|
AC_ARG_WITH(pinentry-pgm,
|
|
|
|
[ --with-pinentry-pgm=PATH Use PATH as the default for the pinentry)],
|
2004-02-12 09:25:30 +00:00
|
|
|
GNUPG_PINENTRY_PGM="$withval", GNUPG_PINENTRY_PGM="" )
|
|
|
|
AC_SUBST(GNUPG_PINENTRY_PGM)
|
|
|
|
AM_CONDITIONAL(GNUPG_PINENTRY_PGM, test -n "$GNUPG_PINENTRY_PGM")
|
|
|
|
show_gnupg_pinentry_pgm="(default)"
|
|
|
|
test -n "$GNUPG_PINENTRY_PGM" && show_gnupg_pinentry_pgm="$GNUPG_PINENTRY_PGM"
|
|
|
|
|
|
|
|
|
2002-10-19 07:55:27 +00:00
|
|
|
AC_ARG_WITH(scdaemon-pgm,
|
|
|
|
[ --with-scdaemon-pgm=PATH Use PATH as the default for the scdaemon)],
|
2004-02-12 09:25:30 +00:00
|
|
|
GNUPG_SCDAEMON_PGM="$withval", GNUPG_SCDAEMON_PGM="" )
|
|
|
|
AC_SUBST(GNUPG_SCDAEMON_PGM)
|
|
|
|
AM_CONDITIONAL(GNUPG_SCDAEMON_PGM, test -n "$GNUPG_SCDAEMON_PGM")
|
|
|
|
show_gnupg_scdaemon_pgm="(default)"
|
|
|
|
test -n "$GNUPG_SCDAEMON_PGM" && show_gnupg_scdaemon_pgm="$GNUPG_SCDAEMON_PGM"
|
|
|
|
|
|
|
|
|
2002-10-19 07:55:27 +00:00
|
|
|
AC_ARG_WITH(dirmngr-pgm,
|
|
|
|
[ --with-dirmngr-pgm=PATH Use PATH as the default for the dirmngr)],
|
2004-02-12 09:25:30 +00:00
|
|
|
GNUPG_DIRMNGR_PGM="$withval", GNUPG_DIRMNGR_PGM="" )
|
|
|
|
AC_SUBST(GNUPG_DIRMNGR_PGM)
|
|
|
|
AM_CONDITIONAL(GNUPG_DIRMNGR_PGM, test -n "$GNUPG_DIRMNGR_PGM")
|
|
|
|
show_gnupg_dirmngr_pgm="(default)"
|
|
|
|
test -n "$GNUPG_DIRMNGR_PGM" && show_gnupg_dirmngr_pgm="$GNUPG_DIRMNGR_PGM"
|
2003-01-09 13:15:07 +00:00
|
|
|
|
2004-02-12 09:25:30 +00:00
|
|
|
AC_ARG_WITH(protect-tool-pgm,
|
|
|
|
[ --with-protect-tool-pgm=PATH Use PATH as the default for the protect-tool)],
|
|
|
|
GNUPG_PROTECT_TOOL_PGM="$withval", GNUPG_PROTECT_TOOL_PGM="" )
|
|
|
|
AC_SUBST(GNUPG_PROTECT_TOOL_PGM)
|
|
|
|
AM_CONDITIONAL(GNUPG_PROTECT_TOOL_PGM, test -n "$GNUPG_PROTECT_TOOL_PGM")
|
|
|
|
show_gnupg_protect_tool_pgm="(default)"
|
|
|
|
test -n "$GNUPG_PROTECT_TOOL_PGM" \
|
|
|
|
&& show_gnupg_protect_tool_pgm="$GNUPG_PROTECT_TOOL_PGM"
|
2002-10-19 07:55:27 +00:00
|
|
|
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
# Some folks want to use only the agent from this packet. Make it
|
2004-07-20 11:22:10 +00:00
|
|
|
# easier for them by providing the configure option
|
|
|
|
# --enable-only-agent.
|
|
|
|
AC_ARG_ENABLE(agent-only,
|
|
|
|
AC_HELP_STRING([--enable-agent-only],[build only the gpg-agent]),
|
|
|
|
build_agent_only=$enableval)
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
# SELinux support includes tracking of sensitive files to avoid
|
|
|
|
# leaking their contents through processing these files by gpg itself
|
|
|
|
AC_MSG_CHECKING([whether SELinux support is requested])
|
|
|
|
AC_ARG_ENABLE(selinux-support,
|
|
|
|
AC_HELP_STRING([--enable-selinux-support],
|
|
|
|
[enable SELinux support]),
|
|
|
|
selinux_support=$enableval, selinux_support=no)
|
|
|
|
AC_MSG_RESULT($selinux_support)
|
|
|
|
|
2006-05-23 16:19:43 +00:00
|
|
|
# Allow disabling of bzib2 support.
|
|
|
|
# It is defined only after we confirm the library is available later
|
|
|
|
AC_MSG_CHECKING([whether to enable the BZIP2 compression algorithm])
|
|
|
|
AC_ARG_ENABLE(bzip2,
|
|
|
|
AC_HELP_STRING([--disable-bzip2],[disable the BZIP2 compression algorithm]),
|
|
|
|
use_bzip2=$enableval)
|
|
|
|
AC_MSG_RESULT($use_bzip2)
|
|
|
|
|
2004-12-06 13:49:14 +00:00
|
|
|
# Configure option to allow or disallow execution of external
|
2004-02-12 09:25:30 +00:00
|
|
|
# programs, like a photo viewer.
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_MSG_CHECKING([whether to enable external program execution])
|
|
|
|
AC_ARG_ENABLE(exec,
|
|
|
|
AC_HELP_STRING([--disable-exec],[disable all external program execution]),
|
|
|
|
use_exec=$enableval)
|
|
|
|
AC_MSG_RESULT($use_exec)
|
|
|
|
if test "$use_exec" = no ; then
|
|
|
|
AC_DEFINE(NO_EXEC,1,[Define to disable all external program execution])
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$use_exec" = yes ; then
|
|
|
|
AC_MSG_CHECKING([whether to enable photo ID viewing])
|
|
|
|
AC_ARG_ENABLE(photo-viewers,
|
|
|
|
[ --disable-photo-viewers disable photo ID viewers],
|
|
|
|
[if test "$enableval" = no ; then
|
|
|
|
AC_DEFINE(DISABLE_PHOTO_VIEWER,1,[define to disable photo viewing])
|
|
|
|
fi],enableval=yes)
|
|
|
|
gnupg_cv_enable_photo_viewers=$enableval
|
|
|
|
AC_MSG_RESULT($enableval)
|
|
|
|
|
|
|
|
if test "$gnupg_cv_enable_photo_viewers" = yes ; then
|
|
|
|
AC_MSG_CHECKING([whether to use a fixed photo ID viewer])
|
|
|
|
AC_ARG_WITH(photo-viewer,
|
|
|
|
[ --with-photo-viewer=FIXED_VIEWER set a fixed photo ID viewer],
|
|
|
|
[if test "$withval" = yes ; then
|
|
|
|
withval=no
|
|
|
|
elif test "$withval" != no ; then
|
|
|
|
AC_DEFINE_UNQUOTED(FIXED_PHOTO_VIEWER,"$withval",
|
|
|
|
[if set, restrict photo-viewer to this])
|
|
|
|
fi],withval=no)
|
|
|
|
AC_MSG_RESULT($withval)
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([whether to enable external keyserver helpers])
|
|
|
|
AC_ARG_ENABLE(keyserver-helpers,
|
|
|
|
[ --disable-keyserver-helpers disable all external keyserver support],
|
|
|
|
[if test "$enableval" = no ; then
|
|
|
|
AC_DEFINE(DISABLE_KEYSERVER_HELPERS,1,
|
|
|
|
[define to disable keyserver helpers])
|
|
|
|
fi],enableval=yes)
|
|
|
|
gnupg_cv_enable_keyserver_helpers=$enableval
|
|
|
|
AC_MSG_RESULT($enableval)
|
|
|
|
|
|
|
|
if test "$gnupg_cv_enable_keyserver_helpers" = yes ; then
|
2006-08-16 10:47:53 +00:00
|
|
|
# LDAP is defined only after we confirm the library is available later
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_MSG_CHECKING([whether LDAP keyserver support is requested])
|
|
|
|
AC_ARG_ENABLE(ldap,
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_HELP_STRING([--disable-ldap],[disable LDAP keyserver interface only]),
|
|
|
|
try_ldap=$enableval, try_ldap=yes)
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_MSG_RESULT($try_ldap)
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([whether HKP keyserver support is requested])
|
|
|
|
AC_ARG_ENABLE(hkp,
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_HELP_STRING([--disable-hkp],[disable HKP keyserver interface only]),
|
|
|
|
try_hkp=$enableval, try_hkp=yes)
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_MSG_RESULT($try_hkp)
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_MSG_CHECKING([whether finger key fetching support is requested])
|
|
|
|
AC_ARG_ENABLE(finger,
|
|
|
|
AC_HELP_STRING([--disable-finger],
|
|
|
|
[disable finger key fetching interface only]),
|
|
|
|
try_finger=$enableval, try_finger=yes)
|
|
|
|
AC_MSG_RESULT($try_finger)
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([whether generic object key fetching support is requested])
|
|
|
|
AC_ARG_ENABLE(generic,
|
|
|
|
AC_HELP_STRING([--disable-generic],
|
|
|
|
[disable generic object key fetching interface only]),
|
|
|
|
try_generic=$enableval, try_generic=yes)
|
|
|
|
AC_MSG_RESULT($try_generic)
|
2003-06-18 19:56:13 +00:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([whether email keyserver support is requested])
|
|
|
|
AC_ARG_ENABLE(mailto,
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_HELP_STRING([--enable-mailto],
|
|
|
|
[enable email keyserver interface only]),
|
|
|
|
try_mailto=$enableval, try_mailto=no)
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_MSG_RESULT($try_mailto)
|
2010-05-04 09:56:42 +00:00
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2010-05-04 09:56:42 +00:00
|
|
|
AC_MSG_CHECKING([whether keyserver exec-path is enabled])
|
|
|
|
AC_ARG_ENABLE(keyserver-path,
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_HELP_STRING([--disable-keyserver-path],
|
2010-05-04 09:56:42 +00:00
|
|
|
[disable the exec-path option for keyserver helpers]),
|
|
|
|
[if test "$enableval" = no ; then
|
|
|
|
disable_keyserver_path=yes
|
|
|
|
fi],enableval=yes)
|
|
|
|
AC_MSG_RESULT($enableval)
|
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# Check for the key/uid cache size. This can't be zero, but can be
|
|
|
|
# pretty small on embedded systems. This is used for the gpg part.
|
|
|
|
#
|
2006-04-19 11:26:11 +00:00
|
|
|
AC_MSG_CHECKING([for the size of the key and uid cache])
|
|
|
|
AC_ARG_ENABLE(key-cache,
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_HELP_STRING([--enable-key-cache=SIZE],
|
|
|
|
[Set key cache to SIZE (default 4096)]),,enableval=4096)
|
2006-04-19 11:26:11 +00:00
|
|
|
if test "$enableval" = "no"; then
|
|
|
|
enableval=5
|
|
|
|
elif test "$enableval" = "yes" || test "$enableval" = ""; then
|
|
|
|
enableval=4096
|
|
|
|
fi
|
|
|
|
changequote(,)dnl
|
|
|
|
key_cache_size=`echo "$enableval" | sed 's/[A-Za-z]//g'`
|
|
|
|
changequote([,])dnl
|
|
|
|
if test "$enableval" != "$key_cache_size" || test "$key_cache_size" -lt 5; then
|
|
|
|
AC_MSG_ERROR([invalid key-cache size])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($key_cache_size)
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_DEFINE_UNQUOTED(PK_UID_CACHE_SIZE,$key_cache_size,
|
|
|
|
[Size of the key and UID caches])
|
2006-04-19 11:26:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# Check whether we want to use Linux capabilities
|
|
|
|
#
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_MSG_CHECKING([whether use of capabilities is requested])
|
|
|
|
AC_ARG_WITH(capabilities,
|
|
|
|
[ --with-capabilities use linux capabilities [default=no]],
|
|
|
|
[use_capabilities="$withval"],[use_capabilities=no])
|
|
|
|
AC_MSG_RESULT($use_capabilities)
|
|
|
|
|
2010-03-09 09:55:24 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Allow disabling of internal CCID support.
|
|
|
|
# It is defined only after we confirm the library is available later
|
|
|
|
#
|
|
|
|
AC_MSG_CHECKING([whether to enable the internal CCID driver])
|
|
|
|
AC_ARG_ENABLE(ccid-driver,
|
|
|
|
AC_HELP_STRING([--disable-ccid-driver],
|
|
|
|
[disable the internal CCID driver]),
|
|
|
|
use_ccid_driver=$enableval)
|
|
|
|
AC_MSG_RESULT($use_ccid_driver)
|
|
|
|
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# To avoid double inclusion of config.h which might happen at some
|
|
|
|
# places, we add the usual double inclusion protection at the top of
|
|
|
|
# config.h.
|
|
|
|
#
|
|
|
|
AH_TOP([
|
|
|
|
#ifndef GNUPG_CONFIG_H_INCLUDED
|
|
|
|
#define GNUPG_CONFIG_H_INCLUDED
|
|
|
|
])
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# Stuff which goes at the bottom of config.h.
|
|
|
|
#
|
2003-06-18 19:56:13 +00:00
|
|
|
AH_BOTTOM([
|
2003-10-02 10:27:34 +00:00
|
|
|
/* This is the major version number of GnuPG so that
|
2006-08-16 10:47:53 +00:00
|
|
|
source included files can test for this. Note, that
|
2003-10-02 10:27:34 +00:00
|
|
|
we use 2 here even for GnuPG 1.9.x. */
|
|
|
|
#define GNUPG_MAJOR_VERSION 2
|
|
|
|
|
2004-02-12 09:25:30 +00:00
|
|
|
/* Now to separate file name parts.
|
|
|
|
Please note that the string version must not contain more
|
|
|
|
than one character because the code assumes strlen()==1 */
|
|
|
|
#ifdef HAVE_DOSISH_SYSTEM
|
|
|
|
#define DIRSEP_C '\\'
|
|
|
|
#define DIRSEP_S "\\"
|
2004-12-20 16:17:25 +00:00
|
|
|
#define EXTSEP_C '.'
|
2004-02-12 09:25:30 +00:00
|
|
|
#define EXTSEP_S "."
|
2004-12-20 16:17:25 +00:00
|
|
|
#define PATHSEP_C ';'
|
|
|
|
#define PATHSEP_S ";"
|
2004-12-18 18:53:32 +00:00
|
|
|
#define EXEEXT_S ".exe"
|
2004-02-12 09:25:30 +00:00
|
|
|
#else
|
|
|
|
#define DIRSEP_C '/'
|
|
|
|
#define DIRSEP_S "/"
|
2004-12-20 16:17:25 +00:00
|
|
|
#define EXTSEP_C '.'
|
2004-02-12 09:25:30 +00:00
|
|
|
#define EXTSEP_S "."
|
2004-12-20 16:17:25 +00:00
|
|
|
#define PATHSEP_C ':'
|
|
|
|
#define PATHSEP_S ":"
|
2004-12-18 18:53:32 +00:00
|
|
|
#define EXEEXT_S ""
|
2004-02-12 09:25:30 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* This is the same as VERSION, but should be overridden if the
|
2004-03-23 13:03:09 +00:00
|
|
|
platform cannot handle things like dots '.' in filenames. Set
|
|
|
|
SAFE_VERSION_DOT and SAFE_VERSION_DASH to whatever SAFE_VERSION
|
|
|
|
uses for dots and dashes. */
|
2004-02-12 09:25:30 +00:00
|
|
|
#define SAFE_VERSION VERSION
|
2004-03-23 13:03:09 +00:00
|
|
|
#define SAFE_VERSION_DOT '.'
|
|
|
|
#define SAFE_VERSION_DASH '-'
|
2004-02-12 09:25:30 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
/* Some global constants. */
|
|
|
|
#ifdef HAVE_DRIVE_LETTERS
|
|
|
|
#define GNUPG_DEFAULT_HOMEDIR "c:/gnupg"
|
|
|
|
#elif defined(__VMS)
|
2011-07-07 11:20:53 +02:00
|
|
|
#define GNUPG_DEFAULT_HOMEDIR "/SYS\$LOGIN/gnupg"
|
2006-08-16 10:47:53 +00:00
|
|
|
#else
|
|
|
|
#define GNUPG_DEFAULT_HOMEDIR "~/.gnupg"
|
2011-07-07 11:20:53 +02:00
|
|
|
#endif
|
2006-08-16 10:47:53 +00:00
|
|
|
#define GNUPG_PRIVATE_KEYS_DIR "private-keys-v1.d"
|
|
|
|
|
2004-02-12 09:25:30 +00:00
|
|
|
/* For some systems (DOS currently), we hardcode the path here. For
|
|
|
|
POSIX systems the values are constructed by the Makefiles, so that
|
|
|
|
the values may be overridden by the make invocations; this is to
|
|
|
|
comply with the GNU coding standards. */
|
|
|
|
#ifdef HAVE_DRIVE_LETTERS
|
2011-07-07 11:20:53 +02:00
|
|
|
/* FIXME: We need to use a function to determine these values depending
|
2007-06-14 17:05:07 +00:00
|
|
|
on the actual installation directory. */
|
2004-02-12 09:25:30 +00:00
|
|
|
#define GNUPG_BINDIR "c:\\gnupg"
|
2004-12-20 16:17:25 +00:00
|
|
|
#define GNUPG_LIBEXECDIR "c:\\gnupg"
|
|
|
|
#define GNUPG_LIBDIR "c:\\gnupg"
|
|
|
|
#define GNUPG_DATADIR "c:\\gnupg"
|
2007-06-14 17:05:07 +00:00
|
|
|
#define GNUPG_SYSCONFDIR "c:\\gnupg"
|
2004-02-12 09:25:30 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Derive some other constants. */
|
|
|
|
#if !(defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID))
|
|
|
|
#define EXEC_TEMPFILE_ONLY
|
|
|
|
#endif
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
|
|
|
|
/* We didn't define endianness above, so get it from OS macros. This
|
|
|
|
is intended for making fat binary builds on OS X. */
|
|
|
|
#if !defined(BIG_ENDIAN_HOST) && !defined(LITTLE_ENDIAN_HOST)
|
|
|
|
#if defined(__BIG_ENDIAN__)
|
|
|
|
#define BIG_ENDIAN_HOST 1
|
|
|
|
#elif defined(__LITTLE_ENDIAN__)
|
|
|
|
#define LITTLE_ENDIAN_HOST 1
|
|
|
|
#else
|
|
|
|
#error "No endianness found"
|
2005-04-21 09:33:07 +00:00
|
|
|
#endif
|
2006-08-16 10:47:53 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2007-12-17 10:49:58 +00:00
|
|
|
/* Hack used for W32: ldap.m4 also tests for the ASCII version of
|
|
|
|
ldap_start_tls_s because that is the actual symbol used in the
|
|
|
|
library. winldap.h redefines it to our commonly used value,
|
|
|
|
thus we define our usual macro here. */
|
|
|
|
#ifdef HAVE_LDAP_START_TLS_SA
|
|
|
|
# ifndef HAVE_LDAP_START_TLS_S
|
|
|
|
# define HAVE_LDAP_START_TLS_S 1
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
/* Tell libgcrypt not to use its own libgpg-error implementation. */
|
|
|
|
#define USE_LIBGPG_ERROR 1
|
2005-04-21 09:33:07 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
/* We use jnlib, so tell other modules about it. */
|
|
|
|
#define HAVE_JNLIB_LOGGING 1
|
|
|
|
|
|
|
|
/* Our HTTP code is used in estream mode. */
|
|
|
|
#define HTTP_USE_ESTREAM 1
|
|
|
|
|
2007-06-14 17:05:07 +00:00
|
|
|
/* Under W32 we do an explicit socket initialization, thus we need to
|
|
|
|
avoid the on-demand initialization which would also install an atexit
|
|
|
|
handler. */
|
|
|
|
#define HTTP_NO_WSASTARTUP
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
/* We always include support for the OpenPGP card. */
|
|
|
|
#define ENABLE_CARD_SUPPORT 1
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
/* We don't want the old assuan codes anymore. */
|
|
|
|
#define _ASSUAN_ONLY_GPG_ERRORS 1
|
2006-08-16 10:47:53 +00:00
|
|
|
|
2006-11-21 11:00:14 +00:00
|
|
|
/* We explicitly need to disable PTH's soft mapping as Debian
|
|
|
|
currently enables it by default for no reason. */
|
|
|
|
#define PTH_SYSCALL_SOFT 0
|
|
|
|
|
2007-05-15 16:10:48 +00:00
|
|
|
/* We want to use the libgcrypt provided memory allocation for
|
|
|
|
asprintf. */
|
2007-05-15 19:47:15 +00:00
|
|
|
#define _ESTREAM_PRINTF_MALLOC gcry_malloc
|
|
|
|
#define _ESTREAM_PRINTF_FREE gcry_free
|
|
|
|
#define _ESTREAM_PRINTF_EXTRA_INCLUDE "util.h"
|
2006-11-21 11:00:14 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#endif /*GNUPG_CONFIG_H_INCLUDED*/
|
2003-06-18 19:56:13 +00:00
|
|
|
])
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
|
2003-06-18 19:56:13 +00:00
|
|
|
AM_MAINTAINER_MODE
|
|
|
|
|
|
|
|
# Checks for programs.
|
2007-06-06 18:12:30 +00:00
|
|
|
AC_MSG_NOTICE([checking for programs])
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_PROG_MAKE_SET
|
|
|
|
AM_SANITY_CHECK
|
|
|
|
missing_dir=`cd $ac_aux_dir && pwd`
|
|
|
|
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
|
|
|
|
AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
|
|
|
|
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
|
|
|
|
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
|
|
|
|
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
|
|
|
|
AC_PROG_AWK
|
|
|
|
AC_PROG_CC
|
|
|
|
AC_PROG_CPP
|
2007-05-04 12:04:26 +00:00
|
|
|
AM_PROG_CC_C_O
|
2007-05-07 19:49:12 +00:00
|
|
|
if test "x$ac_cv_prog_cc_c89" = "xno" ; then
|
|
|
|
AC_MSG_ERROR([[No C-89 compiler found]])
|
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_PROG_INSTALL
|
|
|
|
AC_PROG_LN_S
|
|
|
|
AC_PROG_RANLIB
|
|
|
|
AC_CHECK_TOOL(AR, ar, :)
|
|
|
|
AC_PATH_PROG(PERL,"perl")
|
2007-06-14 17:05:07 +00:00
|
|
|
AC_CHECK_TOOL(WINDRES, windres, :)
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_ISC_POSIX
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 15:46:01 +00:00
|
|
|
gl_EARLY
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_SYS_LARGEFILE
|
|
|
|
GNUPG_CHECK_FAQPROG
|
2006-08-16 10:47:53 +00:00
|
|
|
GNUPG_CHECK_USTAR
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2007-06-06 18:12:30 +00:00
|
|
|
# We need to compile and run a program on the build machine. A
|
|
|
|
# comment in libgpg-error says that the AC_PROG_CC_FOR_BUILD macro in
|
|
|
|
# the AC archive is broken for autoconf 2.57. Given that tehre is no
|
|
|
|
# newer version of that macro, we assume that it is also broken for
|
|
|
|
# autoconf 2.61 and thus we use a simple but usually sufficient
|
|
|
|
# approach.
|
|
|
|
AC_MSG_CHECKING(for cc for build)
|
|
|
|
if test "$cross_compiling" = "yes"; then
|
|
|
|
CC_FOR_BUILD="${CC_FOR_BUILD-cc}"
|
|
|
|
else
|
|
|
|
CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($CC_FOR_BUILD)
|
|
|
|
AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
|
|
|
|
|
|
|
|
|
2003-06-18 19:56:13 +00:00
|
|
|
|
|
|
|
try_gettext=yes
|
|
|
|
have_dosish_system=no
|
2004-12-06 13:49:14 +00:00
|
|
|
have_w32_system=no
|
2006-08-16 10:47:53 +00:00
|
|
|
use_simple_gettext=no
|
2004-12-02 07:48:09 +00:00
|
|
|
case "${host}" in
|
2004-12-07 11:21:40 +00:00
|
|
|
*-mingw32*)
|
2003-06-18 19:56:13 +00:00
|
|
|
# special stuff for Windoze NT
|
|
|
|
ac_cv_have_dev_random=no
|
|
|
|
AC_DEFINE(USE_ONLY_8DOT3,1,
|
|
|
|
[set this to limit filenames to the 8.3 format])
|
|
|
|
AC_DEFINE(HAVE_DRIVE_LETTERS,1,
|
|
|
|
[defined if we must run on a stupid file system])
|
|
|
|
AC_DEFINE(USE_SIMPLE_GETTEXT,1,
|
|
|
|
[because the Unix gettext has too much overhead on
|
|
|
|
MingW32 systems and these systems lack Posix functions,
|
|
|
|
we use a simplified version of gettext])
|
2006-08-16 10:47:53 +00:00
|
|
|
disable_keyserver_path=yes
|
2003-06-18 19:56:13 +00:00
|
|
|
have_dosish_system=yes
|
2004-12-06 13:49:14 +00:00
|
|
|
have_w32_system=yes
|
2003-06-18 19:56:13 +00:00
|
|
|
try_gettext="no"
|
2006-08-16 10:47:53 +00:00
|
|
|
use_simple_gettext=yes
|
2003-06-18 19:56:13 +00:00
|
|
|
;;
|
|
|
|
i?86-emx-os2 | i?86-*-os2*emx )
|
|
|
|
# OS/2 with the EMX environment
|
|
|
|
ac_cv_have_dev_random=no
|
|
|
|
AC_DEFINE(HAVE_DRIVE_LETTERS)
|
|
|
|
have_dosish_system=yes
|
|
|
|
try_gettext="no"
|
|
|
|
;;
|
|
|
|
|
|
|
|
i?86-*-msdosdjgpp*)
|
|
|
|
# DOS with the DJGPP environment
|
|
|
|
ac_cv_have_dev_random=no
|
|
|
|
AC_DEFINE(HAVE_DRIVE_LETTERS)
|
|
|
|
have_dosish_system=yes
|
|
|
|
try_gettext="no"
|
|
|
|
;;
|
|
|
|
|
|
|
|
*-*-freebsd*)
|
|
|
|
# FreeBSD
|
|
|
|
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
|
|
|
|
LDFLAGS="$LDFLAGS -L/usr/local/lib"
|
|
|
|
;;
|
|
|
|
|
|
|
|
*-*-hpux*)
|
|
|
|
if test -z "$GCC" ; then
|
|
|
|
CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
*-dec-osf4*)
|
|
|
|
if test -z "$GCC" ; then
|
|
|
|
# Suppress all warnings
|
|
|
|
# to get rid of the unsigned/signed char mismatch warnings.
|
|
|
|
CFLAGS="$CFLAGS -w"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
*-dec-osf5*)
|
|
|
|
if test -z "$GCC" ; then
|
2006-08-16 10:47:53 +00:00
|
|
|
# Use the newer compiler `-msg_disable ptrmismatch1' to
|
2003-06-18 19:56:13 +00:00
|
|
|
# get rid of the unsigned/signed char mismatch warnings.
|
|
|
|
# Using this may hide other pointer mismatch warnings, but
|
|
|
|
# it at least lets other warning classes through
|
2006-08-16 10:47:53 +00:00
|
|
|
CFLAGS="$CFLAGS -msg_disable ptrmismatch1"
|
2003-06-18 19:56:13 +00:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
m68k-atari-mint)
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
if test "$have_dosish_system" = yes; then
|
|
|
|
AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
|
2011-07-07 11:20:53 +02:00
|
|
|
[Defined if we run on some of the PCDOS like systems
|
2003-06-18 19:56:13 +00:00
|
|
|
(DOS, Windoze. OS/2) with special properties like
|
|
|
|
no file modes])
|
|
|
|
fi
|
|
|
|
AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes)
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
AM_CONDITIONAL(USE_SIMPLE_GETTEXT, test x"$use_simple_gettext" = xyes)
|
|
|
|
|
2004-12-06 13:49:14 +00:00
|
|
|
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)
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
if test "$disable_keyserver_path" = yes; then
|
|
|
|
AC_DEFINE(DISABLE_KEYSERVER_PATH,1,
|
|
|
|
[Defined to disable exec-path for keyserver helpers])
|
|
|
|
fi
|
|
|
|
|
2010-05-04 09:56:42 +00:00
|
|
|
#
|
|
|
|
# Allows enabling the use of a standard socket by default This is
|
|
|
|
# gpg-agent's option --[no-]use-standard-socket. For Windows we force
|
|
|
|
# the use of this.
|
|
|
|
#
|
|
|
|
AC_MSG_CHECKING([whether to use a standard socket by default])
|
|
|
|
AC_ARG_ENABLE(standard-socket,
|
|
|
|
AC_HELP_STRING([--enable-standard-socket],
|
|
|
|
[use a standard socket for the agent by default]),
|
|
|
|
use_standard_socket=$enableval)
|
|
|
|
tmp=""
|
|
|
|
if test "$use_standard_socket" != yes; then
|
|
|
|
if test "$have_w32_system" = yes; then
|
|
|
|
use_standard_socket=yes
|
|
|
|
tmp=" (forced)"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($use_standard_socket$tmp)
|
|
|
|
if test "$use_standard_socket" = yes; then
|
|
|
|
AC_DEFINE(USE_STANDARD_SOCKET,1,
|
|
|
|
[Use a standard socket for the agent by default])
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
# (These need to go after AC_PROG_CC so that $EXEEXT is defined)
|
2006-05-23 16:19:43 +00:00
|
|
|
AC_DEFINE_UNQUOTED(EXEEXT,"$EXEEXT",[The executable file extension, if any])
|
2004-12-06 13:49:14 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
if test x"$try_hkp" = xyes ; then
|
|
|
|
AC_SUBST(GPGKEYS_HKP,"gpg2keys_hkp$EXEEXT")
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test x"$try_finger" = xyes ; then
|
|
|
|
AC_SUBST(GPGKEYS_FINGER,"gpg2keys_finger$EXEEXT")
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2002-06-29 14:15:02 +00:00
|
|
|
#
|
2002-10-19 07:55:27 +00:00
|
|
|
# Checks for libraries.
|
2002-06-29 14:15:02 +00:00
|
|
|
#
|
2007-06-06 18:12:30 +00:00
|
|
|
AC_MSG_NOTICE([checking for libraries])
|
2002-06-29 14:15:02 +00:00
|
|
|
|
2003-12-09 09:12:43 +00:00
|
|
|
|
2003-08-18 17:34:28 +00:00
|
|
|
#
|
|
|
|
# libgpg-error is a library with error codes shared between GnuPG
|
|
|
|
# related projects.
|
|
|
|
#
|
2003-08-19 02:25:25 +00:00
|
|
|
AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
|
2003-08-18 17:34:28 +00:00
|
|
|
have_gpg_error=yes,have_gpg_error=no)
|
|
|
|
|
|
|
|
|
2002-10-19 07:55:27 +00:00
|
|
|
#
|
|
|
|
# Libgcrypt is our generic crypto library
|
|
|
|
#
|
2004-03-06 20:11:19 +00:00
|
|
|
AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION",
|
2003-08-18 17:34:28 +00:00
|
|
|
have_libgcrypt=yes,have_libgcrypt=no)
|
2002-06-29 14:15:02 +00:00
|
|
|
|
|
|
|
|
2003-04-29 10:37:24 +00:00
|
|
|
#
|
|
|
|
# libassuan is used for IPC
|
|
|
|
#
|
2006-10-10 11:11:04 +00:00
|
|
|
AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
|
2003-08-18 17:34:28 +00:00
|
|
|
have_libassuan=yes,have_libassuan=no)
|
2006-10-10 11:11:04 +00:00
|
|
|
if test "$have_libassuan" = "yes"; then
|
2007-09-14 13:38:36 +00:00
|
|
|
AC_DEFINE_UNQUOTED(GNUPG_LIBASSUAN_VERSION, "$libassuan_version",
|
|
|
|
[version of the libbassuan library])
|
2006-10-10 11:11:04 +00:00
|
|
|
fi
|
2003-04-29 10:37:24 +00:00
|
|
|
|
|
|
|
|
2006-11-14 16:40:44 +00:00
|
|
|
|
2002-10-19 07:55:27 +00:00
|
|
|
#
|
|
|
|
# libksba is our X.509 support library
|
|
|
|
#
|
2006-09-06 11:53:24 +00:00
|
|
|
AM_PATH_KSBA("$NEED_KSBA_API:$NEED_KSBA_VERSION",have_ksba=yes,have_ksba=no)
|
2006-08-16 10:47:53 +00:00
|
|
|
|
2002-06-29 14:15:02 +00:00
|
|
|
|
2003-09-02 19:06:34 +00:00
|
|
|
#
|
|
|
|
# libusb allows us to use the integrated CCID smartcard reader driver.
|
2003-09-06 13:23:48 +00:00
|
|
|
#
|
2006-08-16 10:47:53 +00:00
|
|
|
# FiXME: Use GNUPG_CHECK_LIBUSB and modify to use separate AC_SUBSTs.
|
2010-03-09 09:55:24 +00:00
|
|
|
if test "$use_ccid_driver" = yes ; then
|
|
|
|
AC_CHECK_LIB(usb, usb_bulk_write,
|
|
|
|
[ LIBUSB_LIBS="$LIBUSB_LIBS -lusb"
|
|
|
|
AC_DEFINE(HAVE_LIBUSB,1,
|
|
|
|
[defined if libusb is available])
|
|
|
|
have_libusb=yes
|
|
|
|
])
|
|
|
|
AC_CHECK_FUNCS(usb_create_match)
|
|
|
|
fi
|
2003-09-02 19:06:34 +00:00
|
|
|
AC_SUBST(LIBUSB_LIBS)
|
|
|
|
|
2005-04-15 01:33:46 +00:00
|
|
|
#
|
2005-04-15 02:24:44 +00:00
|
|
|
# Check wether it is necessary to link against libdl.
|
|
|
|
#
|
2006-12-06 10:16:50 +00:00
|
|
|
gnupg_dlopen_save_libs="$LIBS"
|
2005-04-15 02:24:44 +00:00
|
|
|
LIBS=""
|
|
|
|
AC_SEARCH_LIBS(dlopen, c dl,,,)
|
|
|
|
DL_LIBS=$LIBS
|
|
|
|
AC_SUBST(DL_LIBS)
|
2006-12-06 10:16:50 +00:00
|
|
|
LIBS="$gnupg_dlopen_save_libs"
|
2005-04-15 02:24:44 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Checks for symcryptrun:
|
2005-04-15 01:33:46 +00:00
|
|
|
#
|
2005-04-15 02:24:44 +00:00
|
|
|
|
|
|
|
# libutil has openpty() and login_tty().
|
2005-04-15 01:33:46 +00:00
|
|
|
AC_CHECK_LIB(util, openpty,
|
|
|
|
[ LIBUTIL_LIBS="$LIBUTIL_LIBS -lutil"
|
|
|
|
AC_DEFINE(HAVE_LIBUTIL,1,
|
|
|
|
[defined if libutil is available])
|
|
|
|
])
|
|
|
|
AC_SUBST(LIBUTIL_LIBS)
|
|
|
|
|
2005-04-15 02:24:44 +00:00
|
|
|
# shred is used to clean temporary plain text files.
|
|
|
|
AC_PATH_PROG(SHRED, shred, /usr/bin/shred)
|
|
|
|
AC_DEFINE_UNQUOTED(SHRED,
|
|
|
|
"${SHRED}", [defines the filename of the shred program])
|
2002-06-29 14:15:02 +00:00
|
|
|
|
2002-10-19 07:55:27 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
|
2002-10-19 07:55:27 +00:00
|
|
|
#
|
2006-08-16 10:47:53 +00:00
|
|
|
# Check whether the GNU Pth library is available
|
2004-12-06 13:49:14 +00:00
|
|
|
# Note, that we include a Pth emulation for W32.
|
2002-10-19 07:55:27 +00:00
|
|
|
#
|
2006-10-10 11:11:04 +00:00
|
|
|
GNUPG_PATH_PTH
|
|
|
|
if test "$have_pth" = "yes"; then
|
|
|
|
AC_DEFINE(USE_GNU_PTH, 1,
|
|
|
|
[Defined if the GNU Portable Thread Library should be used])
|
|
|
|
else
|
|
|
|
AC_MSG_WARN([[
|
2002-10-19 07:55:27 +00:00
|
|
|
***
|
|
|
|
*** To support concurrent access to the gpg-agent and the SCdaemon
|
|
|
|
*** we need the support of the GNU Portable Threads Library.
|
|
|
|
*** Download it from ftp://ftp.gnu.org/gnu/pth/
|
2011-07-07 11:20:53 +02:00
|
|
|
*** On a Debian GNU/Linux system you might want to try
|
2002-10-19 07:55:27 +00:00
|
|
|
*** apt-get install libpth-dev
|
|
|
|
***]])
|
2002-06-29 14:15:02 +00:00
|
|
|
fi
|
2006-10-10 11:11:04 +00:00
|
|
|
|
2002-06-29 14:15:02 +00:00
|
|
|
|
2007-06-06 18:12:30 +00:00
|
|
|
AC_MSG_NOTICE([checking for networking options])
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# Must check for network library requirements before doing link tests
|
|
|
|
# for ldap, for example. If ldap libs are static (or dynamic and without
|
|
|
|
# ELF runtime link paths), then link will fail and LDAP support won't
|
|
|
|
# be detected.
|
|
|
|
#
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname,
|
|
|
|
[NETLIBS="-lnsl $NETLIBS"]))
|
|
|
|
AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
|
|
|
|
[NETLIBS="-lsocket $NETLIBS"]))
|
|
|
|
|
2009-12-07 17:11:59 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Check for ADNS.
|
|
|
|
#
|
|
|
|
_cppflags="${CPPFLAGS}"
|
|
|
|
_ldflags="${LDFLAGS}"
|
|
|
|
AC_ARG_WITH(adns,
|
|
|
|
AC_HELP_STRING([--with-adns=DIR],
|
|
|
|
[look for the adns library in DIR]),
|
|
|
|
[if test -d "$withval"; then
|
|
|
|
CPPFLAGS="${CPPFLAGS} -I$withval/include"
|
|
|
|
LDFLAGS="${LDFLAGS} -L$withval/lib"
|
|
|
|
fi])
|
|
|
|
if test "$with_adns" != "no"; then
|
|
|
|
AC_CHECK_HEADERS(adns.h,
|
|
|
|
AC_CHECK_LIB(adns, adns_init,
|
|
|
|
[have_adns=yes],
|
|
|
|
[CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}]),
|
|
|
|
[CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}])
|
|
|
|
fi
|
|
|
|
if test "$have_adns" = "yes"; then
|
2011-07-07 11:20:53 +02:00
|
|
|
ADNSLIBS="-ladns"
|
2009-12-07 17:11:59 +00:00
|
|
|
fi
|
|
|
|
AC_SUBST(ADNSLIBS)
|
|
|
|
# Newer adns versions feature a free function to be used under W32.
|
|
|
|
AC_CHECK_FUNCS(adns_free)
|
|
|
|
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# Now try for the resolver functions so we can use DNS for SRV, PA and CERT.
|
|
|
|
#
|
|
|
|
if test x"$try_hkp" = xyes || test x"$try_http" = xyes ; then
|
|
|
|
AC_ARG_ENABLE(dns-srv,
|
|
|
|
AC_HELP_STRING([--disable-dns-srv],
|
|
|
|
[disable the use of DNS SRV in HKP and HTTP]),
|
|
|
|
use_dns_srv=$enableval,use_dns_srv=yes)
|
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_ARG_ENABLE(dns-pka,
|
|
|
|
AC_HELP_STRING([--disable-dns-pka],
|
|
|
|
[disable the use of PKA records in DNS]),
|
|
|
|
use_dns_pka=$enableval,use_dns_pka=yes)
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_ARG_ENABLE(dns-cert,
|
|
|
|
AC_HELP_STRING([--disable-dns-cert],
|
|
|
|
[disable the use of CERT records in DNS]),
|
|
|
|
use_dns_cert=$enableval,use_dns_cert=yes)
|
|
|
|
|
|
|
|
if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes \
|
|
|
|
|| test x"$use_dns_cert" = xyes; then
|
|
|
|
_dns_save_libs=$LIBS
|
2003-06-18 19:56:13 +00:00
|
|
|
LIBS=""
|
|
|
|
# the double underscore thing is a glibc-ism?
|
|
|
|
AC_SEARCH_LIBS(res_query,resolv bind,,
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_SEARCH_LIBS(__res_query,resolv bind,,have_resolver=no))
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_SEARCH_LIBS(dn_expand,resolv bind,,
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_SEARCH_LIBS(__dn_expand,resolv bind,,have_resolver=no))
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_SEARCH_LIBS(dn_skipname,resolv bind,,
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_SEARCH_LIBS(__dn_skipname,resolv bind,,have_resolver=no))
|
|
|
|
|
|
|
|
if test x"$have_resolver" != xno ; then
|
|
|
|
|
|
|
|
# Make sure that the BIND 4 resolver interface is workable before
|
|
|
|
# enabling any code that calls it. At some point I'll rewrite the
|
|
|
|
# code to use the BIND 8 resolver API.
|
2009-12-07 17:11:59 +00:00
|
|
|
# We might also want to use adns instead. Problem with ADNS is that
|
|
|
|
# it does not support v6.
|
2006-08-16 10:47:53 +00:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([whether the resolver is usable])
|
2011-08-04 11:36:52 +02:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
|
2006-08-16 10:47:53 +00:00
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <arpa/nameser.h>
|
2011-08-04 11:36:52 +02:00
|
|
|
#include <resolv.h>]],
|
2006-08-16 10:47:53 +00:00
|
|
|
[[unsigned char answer[PACKETSZ];
|
|
|
|
res_query("foo.bar",C_IN,T_A,answer,PACKETSZ);
|
2011-07-07 11:20:53 +02:00
|
|
|
dn_skipname(0,0);
|
2006-08-16 10:47:53 +00:00
|
|
|
dn_expand(0,0,0,0,0);
|
|
|
|
]])],have_resolver=yes,have_resolver=no)
|
|
|
|
AC_MSG_RESULT($have_resolver)
|
|
|
|
|
|
|
|
# This is Apple-specific and somewhat bizarre as they changed the
|
|
|
|
# define in bind 8 for some reason.
|
|
|
|
|
|
|
|
if test x"$have_resolver" != xyes ; then
|
|
|
|
AC_MSG_CHECKING(
|
|
|
|
[whether I can make the resolver usable with BIND_8_COMPAT])
|
2011-08-04 11:36:52 +02:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define BIND_8_COMPAT
|
2006-08-16 10:47:53 +00:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <arpa/nameser.h>
|
2011-08-04 11:36:52 +02:00
|
|
|
#include <resolv.h>]],
|
2006-08-16 10:47:53 +00:00
|
|
|
[[unsigned char answer[PACKETSZ];
|
|
|
|
res_query("foo.bar",C_IN,T_A,answer,PACKETSZ);
|
|
|
|
dn_skipname(0,0); dn_expand(0,0,0,0,0);
|
|
|
|
]])],[have_resolver=yes ; need_compat=yes])
|
|
|
|
AC_MSG_RESULT($have_resolver)
|
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
fi
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
if test x"$have_resolver" = xyes ; then
|
|
|
|
DNSLIBS=$LIBS
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
if test x"$use_dns_srv" = xyes ; then
|
|
|
|
AC_DEFINE(USE_DNS_SRV,1,[define to use DNS SRV])
|
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
if test x"$use_dns_pka" = xyes ; then
|
|
|
|
AC_DEFINE(USE_DNS_PKA,1,[define to use our experimental DNS PKA])
|
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
if test x"$use_dns_cert" = xyes ; then
|
|
|
|
AC_DEFINE(USE_DNS_CERT,1,[define to use DNS CERT])
|
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
if test x"$need_compat" = xyes ; then
|
|
|
|
AC_DEFINE(BIND_8_COMPAT,1,[an Apple OSXism])
|
|
|
|
fi
|
|
|
|
else
|
2009-12-07 17:11:59 +00:00
|
|
|
# If we have no resolver library but ADNS (e.g. under W32) enable the
|
|
|
|
# code parts which can be used with ADNS.
|
|
|
|
if test x"$have_adns" = xyes ; then
|
|
|
|
DNSLIBS="$ADNSLIBS"
|
|
|
|
AC_DEFINE(USE_ADNS,1,[Use ADNS as resolver library.])
|
|
|
|
|
|
|
|
if test x"$use_dns_srv" = xyes ; then
|
|
|
|
AC_DEFINE(USE_DNS_SRV,1)
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test x"$use_dns_pka" = xyes ; then
|
|
|
|
AC_DEFINE(USE_DNS_PKA,1)
|
|
|
|
fi
|
2009-12-08 12:43:27 +00:00
|
|
|
|
|
|
|
if test x"$use_dns_cert" = xyes ; then
|
|
|
|
AC_DEFINE(USE_DNS_CERT,1,[define to use DNS CERT])
|
|
|
|
fi
|
2009-12-07 17:11:59 +00:00
|
|
|
else
|
|
|
|
use_dns_srv=no
|
|
|
|
use_dns_pka=no
|
2009-12-08 12:43:27 +00:00
|
|
|
use_dns_cert=no
|
2009-12-07 17:11:59 +00:00
|
|
|
fi
|
2006-08-16 10:47:53 +00:00
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
LIBS=$_dns_save_libs
|
2003-06-18 19:56:13 +00:00
|
|
|
fi
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_SUBST(DNSLIBS)
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
AM_CONDITIONAL(USE_DNS_SRV, test x"$use_dns_srv" = xyes)
|
2006-06-30 13:19:49 +00:00
|
|
|
|
2008-04-07 19:31:12 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# Check for LDAP
|
|
|
|
#
|
|
|
|
if test "$try_ldap" = yes ; then
|
|
|
|
GNUPG_CHECK_LDAP($NETLIBS)
|
|
|
|
fi
|
2006-06-30 13:19:49 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# Check for curl. We fake the curl API if libcurl isn't installed.
|
2008-04-01 15:08:57 +00:00
|
|
|
# We require 7.10 or later as we use curl_version_info().
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
2008-04-01 15:08:57 +00:00
|
|
|
LIBCURL_CHECK_CONFIG([yes],[7.10],,[fake_curl=yes])
|
2006-08-16 10:47:53 +00:00
|
|
|
AM_CONDITIONAL(FAKE_CURL,test x"$fake_curl" = xyes)
|
2006-06-30 13:19:49 +00:00
|
|
|
|
|
|
|
# Generic, for us, means curl
|
|
|
|
|
|
|
|
if test x"$try_generic" = xyes ; then
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_SUBST(GPGKEYS_CURL,"gpg2keys_curl$EXEEXT")
|
2006-06-30 13:19:49 +00:00
|
|
|
fi
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# Check for sendmail
|
|
|
|
#
|
|
|
|
# This isn't necessarily sendmail itself, but anything that gives a
|
|
|
|
# sendmail-ish interface to the outside world. That includes Exim,
|
|
|
|
# Postfix, etc. Basically, anything that can handle "sendmail -t".
|
2003-06-18 19:56:13 +00:00
|
|
|
if test "$try_mailto" = yes ; then
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_ARG_WITH(mailprog,
|
|
|
|
AC_HELP_STRING([--with-mailprog=NAME],
|
|
|
|
[use "NAME -t" for mail transport]),
|
|
|
|
,with_mailprog=yes)
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
if test x"$with_mailprog" = xyes ; then
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_PATH_PROG(SENDMAIL,sendmail,,$PATH:/usr/sbin:/usr/libexec:/usr/lib)
|
|
|
|
if test "$ac_cv_path_SENDMAIL" ; then
|
2006-08-16 10:47:53 +00:00
|
|
|
GPGKEYS_MAILTO="gpg2keys_mailto"
|
2003-06-18 19:56:13 +00:00
|
|
|
fi
|
2006-08-16 10:47:53 +00:00
|
|
|
elif test x"$with_mailprog" != xno ; then
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_MSG_CHECKING([for a mail transport program])
|
|
|
|
AC_SUBST(SENDMAIL,$with_mailprog)
|
|
|
|
AC_MSG_RESULT($with_mailprog)
|
2006-08-16 10:47:53 +00:00
|
|
|
GPGKEYS_MAILTO="gpg2keys_mailto"
|
2003-06-18 19:56:13 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_SUBST(GPGKEYS_MAILTO)
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# Construct a printable name of the OS
|
|
|
|
#
|
2004-12-02 07:48:09 +00:00
|
|
|
case "${host}" in
|
2004-12-07 11:21:40 +00:00
|
|
|
*-mingw32*)
|
2003-06-18 19:56:13 +00:00
|
|
|
PRINTABLE_OS_NAME="MingW32"
|
|
|
|
;;
|
|
|
|
*-*-cygwin*)
|
|
|
|
PRINTABLE_OS_NAME="Cygwin"
|
|
|
|
;;
|
|
|
|
i?86-emx-os2 | i?86-*-os2*emx )
|
|
|
|
PRINTABLE_OS_NAME="OS/2"
|
|
|
|
;;
|
|
|
|
i?86-*-msdosdjgpp*)
|
|
|
|
PRINTABLE_OS_NAME="MSDOS/DJGPP"
|
|
|
|
try_dynload=no
|
|
|
|
;;
|
|
|
|
*-linux*)
|
|
|
|
PRINTABLE_OS_NAME="GNU/Linux"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
PRINTABLE_OS_NAME=`uname -s || echo "Unknown"`
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
|
|
|
|
[A human readable text with the name of the OS])
|
|
|
|
|
|
|
|
|
2007-07-10 09:24:29 +00:00
|
|
|
#
|
|
|
|
# Checking for iconv
|
|
|
|
#
|
|
|
|
AM_ICONV
|
|
|
|
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# Check for gettext
|
|
|
|
#
|
2009-09-04 17:21:40 +00:00
|
|
|
# This is "GNU gnupg" - The project-id script from gettext
|
|
|
|
# needs this string
|
|
|
|
#
|
2007-06-06 18:12:30 +00:00
|
|
|
AC_MSG_NOTICE([checking for gettext])
|
2007-06-15 15:38:44 +00:00
|
|
|
AM_PO_SUBDIRS
|
2008-02-15 09:58:01 +00:00
|
|
|
AM_GNU_GETTEXT_VERSION([0.17])
|
2003-06-18 19:56:13 +00:00
|
|
|
if test "$try_gettext" = yes; then
|
2007-07-04 19:49:40 +00:00
|
|
|
AM_GNU_GETTEXT([external],[need-ngettext])
|
2003-06-18 19:56:13 +00:00
|
|
|
|
|
|
|
# gettext requires some extra checks. These really should be part of
|
|
|
|
# the basic AM_GNU_GETTEXT macro. TODO: move other gettext-specific
|
|
|
|
# function checks to here.
|
|
|
|
|
|
|
|
AC_CHECK_FUNCS(strchr)
|
|
|
|
else
|
|
|
|
USE_NLS=no
|
|
|
|
USE_INCLUDED_LIBINTL=no
|
|
|
|
BUILD_INCLUDED_LIBINTL=no
|
2007-06-15 15:38:44 +00:00
|
|
|
POSUB=po
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_SUBST(USE_NLS)
|
|
|
|
AC_SUBST(USE_INCLUDED_LIBINTL)
|
|
|
|
AC_SUBST(BUILD_INCLUDED_LIBINTL)
|
2007-06-15 15:38:44 +00:00
|
|
|
AC_SUBST(POSUB)
|
2006-08-16 10:47:53 +00:00
|
|
|
fi
|
|
|
|
|
2007-07-04 22:24:26 +00:00
|
|
|
# We use HAVE_LANGINFO_CODESET in a couple of places.
|
|
|
|
AM_LANGINFO_CODESET
|
2006-08-16 10:47:53 +00:00
|
|
|
|
2007-12-04 11:23:31 +00:00
|
|
|
# Checks required for our use locales
|
|
|
|
gt_LC_MESSAGES
|
|
|
|
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# SELinux support
|
|
|
|
#
|
|
|
|
if test "$selinux_support" = yes ; then
|
|
|
|
AC_DEFINE(ENABLE_SELINUX_HACKS,1,[Define to enable SELinux support])
|
2003-06-18 19:56:13 +00:00
|
|
|
fi
|
2002-10-19 07:55:27 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
|
|
|
|
#
|
2002-10-19 07:55:27 +00:00
|
|
|
# Checks for header files.
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
2007-06-06 18:12:30 +00:00
|
|
|
AC_MSG_NOTICE([checking for header files])
|
2002-06-29 14:15:02 +00:00
|
|
|
AC_HEADER_STDC
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_CHECK_HEADERS([string.h unistd.h langinfo.h termio.h locale.h getopt.h])
|
2011-08-04 12:22:04 +02:00
|
|
|
AC_CHECK_HEADERS([pty.h utmp.h pwd.h inttypes.h])
|
2006-11-21 11:00:14 +00:00
|
|
|
AC_HEADER_TIME
|
2006-08-16 10:47:53 +00:00
|
|
|
|
2002-06-29 14:15:02 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
2002-10-19 07:55:27 +00:00
|
|
|
# Checks for typedefs, structures, and compiler characteristics.
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
2007-06-06 18:12:30 +00:00
|
|
|
AC_MSG_NOTICE([checking for system characteristics])
|
2002-06-29 14:15:02 +00:00
|
|
|
AC_C_CONST
|
|
|
|
AC_C_INLINE
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_C_VOLATILE
|
2002-06-29 14:15:02 +00:00
|
|
|
AC_TYPE_SIZE_T
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_TYPE_MODE_T
|
2002-06-29 14:15:02 +00:00
|
|
|
AC_TYPE_SIGNAL
|
|
|
|
AC_DECL_SYS_SIGLIST
|
|
|
|
|
2008-04-23 17:23:04 +00:00
|
|
|
gl_HEADER_SYS_SOCKET
|
|
|
|
gl_TYPE_SOCKLEN_T
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_ARG_ENABLE(endian-check,
|
|
|
|
AC_HELP_STRING([--disable-endian-check],
|
|
|
|
[disable the endian check and trust the OS provided macros]),
|
|
|
|
endiancheck=$enableval,endiancheck=yes)
|
|
|
|
|
|
|
|
if test x"$endiancheck" = xyes ; then
|
|
|
|
GNUPG_CHECK_ENDIAN
|
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
# fixme: we should get rid of the byte type
|
2002-06-29 14:15:02 +00:00
|
|
|
GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF)
|
|
|
|
GNUPG_CHECK_TYPEDEF(ushort, HAVE_USHORT_TYPEDEF)
|
|
|
|
GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF)
|
2003-06-18 19:56:13 +00:00
|
|
|
GNUPG_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF)
|
|
|
|
GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)
|
|
|
|
|
|
|
|
AC_CHECK_SIZEOF(unsigned short)
|
|
|
|
AC_CHECK_SIZEOF(unsigned int)
|
|
|
|
AC_CHECK_SIZEOF(unsigned long)
|
|
|
|
AC_CHECK_SIZEOF(unsigned long long)
|
2006-11-21 11:00:14 +00:00
|
|
|
AC_CHECK_SIZEOF(time_t,,[[
|
|
|
|
#include <stdio.h>
|
|
|
|
#if TIME_WITH_SYS_TIME
|
|
|
|
# include <sys/time.h>
|
|
|
|
# include <time.h>
|
|
|
|
#else
|
|
|
|
# if HAVE_SYS_TIME_H
|
|
|
|
# include <sys/time.h>
|
|
|
|
# else
|
|
|
|
# include <time.h>
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
]])
|
|
|
|
|
|
|
|
|
2003-09-23 17:48:33 +00:00
|
|
|
# Ensure that we have UINT64_C before we bother to check for uint64_t
|
2006-08-16 10:47:53 +00:00
|
|
|
# Fixme: really needed in gnupg? I think it is only useful in libcgrypt.
|
2003-09-23 17:48:33 +00:00
|
|
|
AC_CACHE_CHECK([for UINT64_C],[gnupg_cv_uint64_c_works],
|
2011-08-04 11:36:52 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <inttypes.h>]],
|
|
|
|
[[uint64_t foo=UINT64_C(42);]])],
|
|
|
|
[gnupg_cv_uint64_c_works=yes],
|
|
|
|
[gnupg_cv_uint64_c_works=no] ))
|
2003-09-23 17:48:33 +00:00
|
|
|
if test "$gnupg_cv_uint64_c_works" = "yes" ; then
|
|
|
|
AC_CHECK_SIZEOF(uint64_t)
|
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
|
|
|
|
if test "$ac_cv_sizeof_unsigned_short" = "0" \
|
|
|
|
|| test "$ac_cv_sizeof_unsigned_int" = "0" \
|
|
|
|
|| test "$ac_cv_sizeof_unsigned_long" = "0"; then
|
|
|
|
AC_MSG_WARN([Hmmm, something is wrong with the sizes - using defaults]);
|
|
|
|
fi
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
|
|
|
|
#
|
2002-10-19 07:55:27 +00:00
|
|
|
# Checks for library functions.
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
2007-06-06 18:12:30 +00:00
|
|
|
AC_MSG_NOTICE([checking for library functions])
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_CHECK_DECLS(getpagesize)
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_FUNC_FSEEKO
|
|
|
|
AC_FUNC_VPRINTF
|
|
|
|
AC_FUNC_FORK
|
2006-10-19 14:22:06 +00:00
|
|
|
AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap])
|
2006-10-02 11:54:35 +00:00
|
|
|
AC_CHECK_FUNCS([strcasecmp strncasecmp ctermid times gmtime_r])
|
2009-08-26 10:12:17 +00:00
|
|
|
AC_CHECK_FUNCS([unsetenv fcntl ftruncate])
|
2009-03-19 07:09:31 +00:00
|
|
|
AC_CHECK_FUNCS([gettimeofday getrusage getrlimit setrlimit clock_gettime])
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_CHECK_FUNCS([atexit raise getpagesize strftime nl_langinfo setlocale])
|
|
|
|
AC_CHECK_FUNCS([waitpid wait4 sigaction sigprocmask pipe stat getaddrinfo])
|
2011-01-11 19:35:05 +01:00
|
|
|
AC_CHECK_FUNCS([ttyname rand ftello fsync stat])
|
2003-09-23 17:48:33 +00:00
|
|
|
|
|
|
|
AC_CHECK_TYPES([struct sigaction, sigset_t],,,[#include <signal.h>])
|
2002-06-29 14:15:02 +00:00
|
|
|
|
2006-10-02 11:54:35 +00:00
|
|
|
#
|
2006-11-14 16:40:44 +00:00
|
|
|
# These are needed by libjnlib - fixme: we should use a jnlib.m4
|
2009-08-26 10:12:17 +00:00
|
|
|
# Note: We already checked pwd.h.
|
2006-10-02 11:54:35 +00:00
|
|
|
AC_CHECK_FUNCS([memicmp stpcpy strsep strlwr strtoul memmove stricmp strtol])
|
2006-10-19 14:22:06 +00:00
|
|
|
AC_CHECK_FUNCS([memrchr isascii timegm getrusage setrlimit stat setlocale])
|
2009-08-26 10:12:17 +00:00
|
|
|
AC_CHECK_FUNCS([flockfile funlockfile fopencookie funopen getpwnam getpwuid])
|
2006-10-02 11:54:35 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 15:46:01 +00:00
|
|
|
# gnulib checks
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
2006-11-21 15:29:52 +00:00
|
|
|
gl_SOURCE_BASE([gl])
|
|
|
|
gl_M4_BASE([gl/m4])
|
2007-06-06 18:12:30 +00:00
|
|
|
gl_MODULES([setenv mkdtemp xsize strpbrk])
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 15:46:01 +00:00
|
|
|
gl_INIT
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
|
|
|
|
#
|
2006-08-17 18:01:25 +00:00
|
|
|
# W32 specific test
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
2006-08-17 18:01:25 +00:00
|
|
|
GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
2003-06-18 19:56:13 +00:00
|
|
|
# Sanity check regex. Tests adapted from mutt.
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_MSG_CHECKING([whether regular expression support is requested])
|
|
|
|
AC_ARG_ENABLE(regex,
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_HELP_STRING([--disable-regex],
|
|
|
|
[do not handle regular expressions in trust signatures]),
|
|
|
|
use_regex=$enableval, use_regex=yes)
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_MSG_RESULT($use_regex)
|
|
|
|
|
|
|
|
if test "$use_regex" = yes ; then
|
2007-08-27 18:10:27 +00:00
|
|
|
_cppflags="${CPPFLAGS}"
|
|
|
|
_ldflags="${LDFLAGS}"
|
|
|
|
AC_ARG_WITH(regex,
|
|
|
|
AC_HELP_STRING([--with-regex=DIR],[look for regex in DIR]),
|
|
|
|
[
|
|
|
|
if test -d "$withval" ; then
|
|
|
|
CPPFLAGS="${CPPFLAGS} -I$withval/include"
|
|
|
|
LDFLAGS="${LDFLAGS} -L$withval/lib"
|
|
|
|
fi
|
2011-07-07 11:20:53 +02:00
|
|
|
],withval="")
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2007-08-27 18:10:27 +00:00
|
|
|
# Does the system have regex functions at all?
|
|
|
|
AC_SEARCH_LIBS([regcomp], [regex])
|
|
|
|
AC_CHECK_FUNC(regcomp, gnupg_cv_have_regex=yes, gnupg_cv_have_regex=no)
|
|
|
|
|
|
|
|
if test $gnupg_cv_have_regex = no; then
|
|
|
|
use_regex=no
|
|
|
|
else
|
|
|
|
if test x"$cross_compiling" = xyes; then
|
|
|
|
AC_MSG_WARN([cross compiling; assuming regexp libray is not broken])
|
|
|
|
else
|
|
|
|
AC_CACHE_CHECK([whether your system's regexp library is broken],
|
2003-06-18 19:56:13 +00:00
|
|
|
[gnupg_cv_regex_broken],
|
|
|
|
AC_TRY_RUN([
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <regex.h>
|
|
|
|
main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }],
|
|
|
|
gnupg_cv_regex_broken=no, gnupg_cv_regex_broken=yes, gnupg_cv_regex_broken=yes))
|
|
|
|
|
2007-08-27 18:10:27 +00:00
|
|
|
if test $gnupg_cv_regex_broken = yes; then
|
|
|
|
AC_MSG_WARN([your regex is broken - disabling regex use])
|
|
|
|
use_regex=no
|
|
|
|
fi
|
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
fi
|
2007-08-27 18:10:27 +00:00
|
|
|
CPPFLAGS="${_cppflags}"
|
|
|
|
LDFLAGS="${_ldflags}"
|
2003-06-18 19:56:13 +00:00
|
|
|
fi
|
|
|
|
|
2007-08-27 18:10:27 +00:00
|
|
|
if test "$use_regex" != yes ; then
|
|
|
|
AC_DEFINE(DISABLE_REGEX,1, [Define to disable regular expression support])
|
|
|
|
fi
|
|
|
|
AM_CONDITIONAL(DISABLE_REGEX, test x"$use_regex" != xyes)
|
2006-08-16 10:47:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2006-05-23 16:19:43 +00:00
|
|
|
#
|
|
|
|
# Do we have zlib? Must do it here because Solaris failed
|
|
|
|
# when compiling a conftest (due to the "-lz" from LIBS).
|
|
|
|
# Note that we combine zlib and bzlib2 in ZLIBS.
|
|
|
|
#
|
2004-12-15 14:15:54 +00:00
|
|
|
_cppflags="${CPPFLAGS}"
|
|
|
|
_ldflags="${LDFLAGS}"
|
|
|
|
AC_ARG_WITH(zlib,
|
2003-06-18 19:56:13 +00:00
|
|
|
[ --with-zlib=DIR use libz in DIR],[
|
|
|
|
if test -d "$withval"; then
|
|
|
|
CPPFLAGS="${CPPFLAGS} -I$withval/include"
|
|
|
|
LDFLAGS="${LDFLAGS} -L$withval/lib"
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
AC_CHECK_HEADER(zlib.h,
|
2003-06-18 19:56:13 +00:00
|
|
|
AC_CHECK_LIB(z, deflateInit2_,
|
2006-05-23 16:19:43 +00:00
|
|
|
ZLIBS="-lz",
|
2003-06-18 19:56:13 +00:00
|
|
|
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
|
|
|
|
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
|
2006-05-23 16:19:43 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Check whether we can support bzip2
|
2011-07-07 11:20:53 +02:00
|
|
|
#
|
2006-05-23 16:19:43 +00:00
|
|
|
if test "$use_bzip2" = yes ; then
|
|
|
|
_cppflags="${CPPFLAGS}"
|
|
|
|
_ldflags="${LDFLAGS}"
|
|
|
|
AC_ARG_WITH(bzip2,
|
|
|
|
AC_HELP_STRING([--with-bzip2=DIR],[look for bzip2 in DIR]),
|
|
|
|
[
|
|
|
|
if test -d "$withval" ; then
|
|
|
|
CPPFLAGS="${CPPFLAGS} -I$withval/include"
|
|
|
|
LDFLAGS="${LDFLAGS} -L$withval/lib"
|
|
|
|
fi
|
|
|
|
],withval="")
|
|
|
|
|
|
|
|
# Checking alongside stdio.h as an early version of bzip2 (1.0)
|
2011-07-07 11:20:53 +02:00
|
|
|
# required stdio.h to be included before bzlib.h, and Solaris 9 is
|
2006-05-23 16:19:43 +00:00
|
|
|
# woefully out of date.
|
|
|
|
if test "$withval" != no ; then
|
|
|
|
AC_CHECK_HEADER(bzlib.h,
|
|
|
|
AC_CHECK_LIB(bz2,BZ2_bzCompressInit,
|
|
|
|
[
|
|
|
|
have_bz2=yes
|
|
|
|
ZLIBS="$ZLIBS -lbz2"
|
|
|
|
AC_DEFINE(HAVE_BZIP2,1,
|
|
|
|
[Defined if the bz2 compression library is available])
|
|
|
|
],
|
|
|
|
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
|
|
|
|
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags},[#include <stdio.h>])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AM_CONDITIONAL(ENABLE_BZIP2_SUPPORT,test x"$have_bz2" = "xyes")
|
|
|
|
AC_SUBST(ZLIBS)
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2004-08-17 15:26:22 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
# Check for readline support
|
|
|
|
GNUPG_CHECK_READLINE
|
|
|
|
|
|
|
|
#
|
2003-06-18 19:56:13 +00:00
|
|
|
# Allow users to append something to the version string without
|
|
|
|
# flagging it as development version. The user version parts is
|
2011-07-07 11:20:53 +02:00
|
|
|
# considered everything after a dash.
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
2003-06-18 19:56:13 +00:00
|
|
|
if test "$development_version" != yes; then
|
|
|
|
changequote(,)dnl
|
|
|
|
tmp_pat='[a-zA-Z]'
|
|
|
|
changequote([,])dnl
|
|
|
|
if echo "$VERSION" | sed 's/-.*//' | grep "$tmp_pat" >/dev/null ; then
|
|
|
|
development_version=yes
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$development_version" = yes; then
|
|
|
|
AC_DEFINE(IS_DEVELOPMENT_VERSION,1,
|
|
|
|
[Defined if this is not a regular release])
|
|
|
|
fi
|
|
|
|
|
|
|
|
AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
|
|
|
|
|
|
|
|
GNUPG_CHECK_GNUMAKE
|
|
|
|
|
2004-12-06 13:49:14 +00:00
|
|
|
# Add some extra libs here so that previous tests don't fail for
|
2007-06-15 14:27:31 +00:00
|
|
|
# mysterious reasons - the final link step should bail out.
|
|
|
|
# W32SOCKLIBS is also defined so that if can be used for tools not
|
|
|
|
# requiring any network stuff but linking to code in libcommon which
|
|
|
|
# tracks in winsock stuff (e.g. init_common_subsystems.
|
2004-12-06 13:49:14 +00:00
|
|
|
if test "$have_w32_system" = yes; then
|
2007-07-04 09:34:28 +00:00
|
|
|
W32SOCKLIBS="-lws2_32"
|
2007-06-15 14:27:31 +00:00
|
|
|
NETLIBS="${NETLIBS} ${W32SOCKLIBS}"
|
2004-12-06 13:49:14 +00:00
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_SUBST(NETLIBS)
|
2007-06-15 14:27:31 +00:00
|
|
|
AC_SUBST(W32SOCKLIBS)
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
#
|
|
|
|
# Setup gcc specific options
|
|
|
|
#
|
2007-06-06 18:12:30 +00:00
|
|
|
AC_MSG_NOTICE([checking for cc features])
|
2003-06-18 19:56:13 +00:00
|
|
|
if test "$GCC" = yes; then
|
2006-08-16 10:47:53 +00:00
|
|
|
# Note that it is okay to use CFLAGS here because this are just
|
|
|
|
# warning options and the user should have a chance of overriding
|
|
|
|
# them.
|
2003-06-18 19:56:13 +00:00
|
|
|
if test "$USE_MAINTAINER_MODE" = "yes"; then
|
|
|
|
CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
|
2007-05-15 19:47:15 +00:00
|
|
|
CFLAGS="$CFLAGS -Wformat -Wno-format-y2k -Wformat-security"
|
2008-10-17 19:18:46 +00:00
|
|
|
AC_MSG_CHECKING([if gcc supports -Wno-missing-field-initializers])
|
|
|
|
_gcc_cflags_save=$CFLAGS
|
|
|
|
CFLAGS="-Wno-missing-field-initializers"
|
2011-08-04 11:36:52 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
|
|
|
|
[_gcc_wopt=yes],[_gcc_wopt=no])
|
2008-10-17 19:18:46 +00:00
|
|
|
AC_MSG_RESULT($_gcc_wopt)
|
|
|
|
CFLAGS=$_gcc_cflags_save;
|
|
|
|
if test x"$_gcc_wopt" = xyes ; then
|
|
|
|
CFLAGS="$CFLAGS -W -Wno-sign-compare -Wno-missing-field-initializers"
|
|
|
|
fi
|
|
|
|
AC_MSG_CHECKING([if gcc supports -Wdeclaration-after-statement])
|
|
|
|
_gcc_cflags_save=$CFLAGS
|
|
|
|
CFLAGS="-Wdeclaration-after-statement"
|
2011-08-04 11:36:52 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
|
|
|
|
[_gcc_wopt=yes],[_gcc_wopt=no])
|
2008-10-17 19:18:46 +00:00
|
|
|
AC_MSG_RESULT($_gcc_wopt)
|
|
|
|
CFLAGS=$_gcc_cflags_save;
|
|
|
|
if test x"$_gcc_wopt" = xyes ; then
|
|
|
|
CFLAGS="$CFLAGS -Wdeclaration-after-statement"
|
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
else
|
|
|
|
CFLAGS="$CFLAGS -Wall"
|
|
|
|
fi
|
2006-08-16 10:47:53 +00:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
|
|
|
|
_gcc_cflags_save=$CFLAGS
|
|
|
|
CFLAGS="-Wno-pointer-sign"
|
2011-08-04 11:36:52 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[_gcc_psign=yes],[_gcc_psign=no])
|
2006-08-16 10:47:53 +00:00
|
|
|
AC_MSG_RESULT($_gcc_psign)
|
|
|
|
CFLAGS=$_gcc_cflags_save;
|
|
|
|
if test x"$_gcc_psign" = xyes ; then
|
|
|
|
CFLAGS="$CFLAGS -Wno-pointer-sign"
|
|
|
|
fi
|
2007-06-06 18:12:30 +00:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([if gcc supports -Wpointer-arith])
|
|
|
|
_gcc_cflags_save=$CFLAGS
|
|
|
|
CFLAGS="-Wpointer-arith"
|
2011-08-04 11:36:52 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[_gcc_psign=yes],[_gcc_psign=no])
|
2007-06-06 18:12:30 +00:00
|
|
|
AC_MSG_RESULT($_gcc_psign)
|
|
|
|
CFLAGS=$_gcc_cflags_save;
|
|
|
|
if test x"$_gcc_psign" = xyes ; then
|
|
|
|
CFLAGS="$CFLAGS -Wpointer-arith"
|
|
|
|
fi
|
2003-06-18 19:56:13 +00:00
|
|
|
fi
|
|
|
|
|
2006-08-16 10:47:53 +00:00
|
|
|
|
2006-05-24 11:12:28 +00:00
|
|
|
#
|
|
|
|
# This is handy for debugging so the compiler doesn't rearrange
|
|
|
|
# things and eliminate variables.
|
|
|
|
#
|
|
|
|
AC_ARG_ENABLE(optimization,
|
|
|
|
AC_HELP_STRING([--disable-optimization],
|
|
|
|
[disable compiler optimization]),
|
|
|
|
[if test $enableval = no ; then
|
|
|
|
CFLAGS=`echo $CFLAGS | sed 's/-O[[0-9]]//'`
|
|
|
|
fi])
|
|
|
|
|
2007-05-15 16:10:48 +00:00
|
|
|
#
|
|
|
|
# Prepare building of estream
|
|
|
|
#
|
|
|
|
estream_INIT
|
|
|
|
|
|
|
|
|
2004-02-25 08:58:46 +00:00
|
|
|
#
|
|
|
|
# Decide what to build
|
|
|
|
#
|
2008-04-07 19:31:12 +00:00
|
|
|
if test "$have_adns" = "yes"; then
|
|
|
|
AC_SUBST(GPGKEYS_KDNS, "gpg2keys_kdns$EXEEXT")
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
2004-02-25 08:58:46 +00:00
|
|
|
missing_pth=no
|
|
|
|
if test $have_ksba = no; then
|
|
|
|
build_gpgsm=no
|
|
|
|
build_scdaemon=no
|
|
|
|
fi
|
|
|
|
|
|
|
|
build_agent_threaded=""
|
|
|
|
if test "$build_agent" = "yes"; then
|
|
|
|
if test $have_pth = no; then
|
|
|
|
build_agent_threaded="(not multi-threaded)"
|
|
|
|
missing_pth=yes
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
build_scdaemon_extra=""
|
|
|
|
if test "$build_scdaemon" = "yes"; then
|
|
|
|
tmp=""
|
|
|
|
if test $have_pth = no; then
|
|
|
|
build_scdaemon_extra="not multi-threaded"
|
|
|
|
tmp=", "
|
|
|
|
missing_pth=yes
|
|
|
|
fi
|
2006-09-06 11:53:24 +00:00
|
|
|
if test $have_libusb = no; then
|
|
|
|
build_scdaemon_extra="${tmp}without internal CCID driver"
|
|
|
|
tmp=", "
|
|
|
|
fi
|
2004-02-25 08:58:46 +00:00
|
|
|
if test -n "$build_scdaemon_extra"; then
|
|
|
|
build_scdaemon_extra="(${build_scdaemon_extra})"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2005-01-13 18:00:46 +00:00
|
|
|
|
2004-07-20 11:22:10 +00:00
|
|
|
if test "$build_agent_only" = "yes" ; then
|
|
|
|
build_gpg=no
|
|
|
|
build_gpgsm=no
|
|
|
|
build_scdaemon=no
|
2006-09-18 13:23:18 +00:00
|
|
|
build_tools=no
|
|
|
|
build_doc=no
|
2004-07-20 11:22:10 +00:00
|
|
|
fi
|
|
|
|
|
2004-12-02 07:48:09 +00:00
|
|
|
|
2004-02-25 08:58:46 +00:00
|
|
|
AM_CONDITIONAL(BUILD_GPG, test "$build_gpg" = "yes")
|
|
|
|
AM_CONDITIONAL(BUILD_GPGSM, test "$build_gpgsm" = "yes")
|
|
|
|
AM_CONDITIONAL(BUILD_AGENT, test "$build_agent" = "yes")
|
|
|
|
AM_CONDITIONAL(BUILD_SCDAEMON, test "$build_scdaemon" = "yes")
|
2006-09-18 13:23:18 +00:00
|
|
|
AM_CONDITIONAL(BUILD_TOOLS, test "$build_tools" = "yes")
|
|
|
|
AM_CONDITIONAL(BUILD_DOC, test "$build_doc" = "yes")
|
2005-04-15 01:33:46 +00:00
|
|
|
AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes")
|
2011-01-11 19:35:05 +01:00
|
|
|
AM_CONDITIONAL(BUILD_GPGTAR, test "$build_gpgtar" = "yes")
|
2004-02-25 08:58:46 +00:00
|
|
|
|
2006-09-06 21:09:36 +00:00
|
|
|
AM_CONDITIONAL(RUN_GPG_TESTS,
|
|
|
|
test x$cross_compiling = xno -a "$build_gpg" = yes )
|
2004-02-25 08:58:46 +00:00
|
|
|
|
2003-08-18 17:34:28 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Print errors here so that they are visible all
|
|
|
|
# together and the user can acquire them all together.
|
|
|
|
#
|
|
|
|
die=no
|
|
|
|
if test "$have_gpg_error" = "no"; then
|
|
|
|
die=yes
|
|
|
|
AC_MSG_NOTICE([[
|
2011-07-07 11:20:53 +02:00
|
|
|
***
|
2003-08-18 17:34:28 +00:00
|
|
|
*** You need libgpg-error to build this program.
|
|
|
|
** This library is for example available at
|
2005-02-03 13:20:57 +00:00
|
|
|
*** ftp://ftp.gnupg.org/gcrypt/libgpg-error
|
2003-08-18 17:34:28 +00:00
|
|
|
*** (at least version $NEED_GPG_ERROR_VERSION is required.)
|
|
|
|
***]])
|
|
|
|
fi
|
|
|
|
if test "$have_libgcrypt" = "no"; then
|
|
|
|
die=yes
|
|
|
|
AC_MSG_NOTICE([[
|
2011-07-07 11:20:53 +02:00
|
|
|
***
|
2003-08-18 17:34:28 +00:00
|
|
|
*** You need libgcrypt to build this program.
|
|
|
|
** This library is for example available at
|
2005-02-03 13:20:57 +00:00
|
|
|
*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
|
2006-09-06 11:53:24 +00:00
|
|
|
*** (at least version $NEED_LIBGCRYPT_VERSION using API $NEED_LIBGCRYPT_API is required.)
|
2003-08-18 17:34:28 +00:00
|
|
|
***]])
|
|
|
|
fi
|
|
|
|
if test "$have_libassuan" = "no"; then
|
|
|
|
die=yes
|
|
|
|
AC_MSG_NOTICE([[
|
|
|
|
***
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
Conflicts:
ChangeLog
agent/ChangeLog
agent/command.c
common/ChangeLog
g10/ChangeLog
scd/ChangeLog
sm/ChangeLog
sm/gpgsm.c
tools/ChangeLog
Somehow this slipped through. Really commit this time.
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* configure.ac: Check for libassuan instead of libassuan-pth.
common/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* Makefile.am (libcommon_a_CFLAGS): Use LIBASSUAN_CFLAGS instead
of LIBASSUAN_PTH_CFLAGS.
scd/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, scdaemon_LDADD: Use libassuan instead of libassuan-pth.
* scdaemon.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
g13/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, g13_LDADD: Use libassuan instead of libassuan-pth.
* g13.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks.
agent/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of
libassuan-pth.
* gpg-agent.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
Fix invocation of assuan_socket_connect.
Conflicts:
ChangeLog
agent/ChangeLog
common/ChangeLog
configure.ac
g13/ChangeLog
g13/Makefile.am
g13/g13.c
scd/ChangeLog
agent/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
common/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
g10/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
scd/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
sm/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
* call-agent.c (membuf_data_cb, default_inq_cb)
(inq_ciphertext_cb, scd_serialno_status_cb)
(scd_keypairinfo_status_cb, istrusted_status_cb)
(learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
Conflicts:
agent/ChangeLog
common/ChangeLog
g10/ChangeLog
g10/server.c
g13/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
Adjust for assuan_register_command change.
Conflicts:
agent/ChangeLog
g10/ChangeLog
g13/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
Add hack for the HELP command.
Conflicts:
tools/ChangeLog
Add help strings for all commands.
Conflicts:
agent/ChangeLog
agent/command.c
Add help strings for all commands.
Conflicts:
scd/ChangeLog
Add help strings for all commands
Conflicts:
sm/ChangeLog
agent/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Call assuan_pipe_connect, not
assuan_pipe_connect_ext.
* command.c (start_command_handler): Change
assuan_init_socket_server_ext into assuan_init_socket_server.
* call-scd.c (start_scd): Update use of assuan_socket_connect and
assuan_pipe_connect.
* gpg-agent.c (check_own_socket_thread, check_for_running_agent):
Update use of assuan_socket_connect.
common/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
scd/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Call assuan_init_socket_server,
not assuan_init_socket_server_ext.
sm/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Update use of
assuan_pipe_connect and assuan_socket_connect.
tools/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (start_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
Conflicts:
agent/ChangeLog
common/ChangeLog
g13/ChangeLog
g13/call-gpg.c
scd/ChangeLog
sm/ChangeLog
tools/ChangeLog
agent/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
scd/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
sm/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* server.c (gpgsm_server): Use assuan_fd_t and assuan_fdopen on
fds.
g10/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.
Conflicts:
agent/ChangeLog
g10/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
2009-11-27 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Do not call
assuan_set_log_stream anymore.
* gpg-agent.c (main): But call assuan_set_assuan_log_stream here.
Conflicts:
agent/ChangeLog
agent/command.c
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing
argument in assuan_socket_connect invocation.
* iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function
declaration.
Conflicts:
common/ChangeLog
common/iobuf.c
common/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD.
agent/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Convert posix fd to assuan fd.
* call-scd.c (start_scd): Likewise.
sm/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Convert posix fd to assuan fd.
tools/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (main): Convert posix fd to assuan fd.
Conflicts:
agent/ChangeLog
common/ChangeLog
g13/call-gpg.c
sm/ChangeLog
tools/ChangeLog
2010-02-12 15:15:34 +00:00
|
|
|
*** You need libassuan to build this program.
|
2003-08-18 17:34:28 +00:00
|
|
|
*** This library is for example available at
|
2006-11-05 15:08:58 +00:00
|
|
|
*** ftp://ftp.gnupg.org/gcrypt/libassuan/
|
2006-10-10 11:11:04 +00:00
|
|
|
*** (at least version $NEED_LIBASSUAN_VERSION (API $NEED_LIBASSUAN_API) is required).
|
2003-08-18 17:34:28 +00:00
|
|
|
***]])
|
|
|
|
fi
|
|
|
|
if test "$have_ksba" = "no"; then
|
|
|
|
AC_MSG_NOTICE([[
|
|
|
|
***
|
|
|
|
*** You need libksba to build this program.
|
|
|
|
*** This library is for example available at
|
2006-09-06 11:53:24 +00:00
|
|
|
*** ftp://ftp.gnupg.org/gcrypt/libksba/
|
|
|
|
*** (at least version $NEED_KSBA_VERSION using API $NEED_KSBA_API is required).
|
2003-08-18 17:34:28 +00:00
|
|
|
***]])
|
|
|
|
fi
|
2004-02-25 08:58:46 +00:00
|
|
|
if test "$missing_pth" = "yes"; then
|
|
|
|
AC_MSG_NOTICE([[
|
|
|
|
***
|
2005-05-18 10:48:06 +00:00
|
|
|
*** It is now required to build with support for the
|
2004-02-25 08:58:46 +00:00
|
|
|
*** GNU Portable Threads Library (Pth). Please install this
|
2005-05-18 10:48:06 +00:00
|
|
|
*** library first. The library is for example available at
|
2004-02-25 08:58:46 +00:00
|
|
|
*** ftp://ftp.gnu.org/gnu/pth/
|
2011-07-07 11:20:53 +02:00
|
|
|
*** On a Debian GNU/Linux system you can install it using
|
2004-02-25 08:58:46 +00:00
|
|
|
*** apt-get install libpth-dev
|
2007-06-06 18:12:30 +00:00
|
|
|
*** To build GnuPG for Windows you need to use the W32PTH
|
|
|
|
*** package; available at:
|
|
|
|
*** ftp://ftp.g10code.com/g10code/w32pth/
|
2004-02-25 08:58:46 +00:00
|
|
|
***]])
|
2005-05-18 10:48:06 +00:00
|
|
|
die=yes
|
2004-02-25 08:58:46 +00:00
|
|
|
fi
|
2003-08-18 17:34:28 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
2002-06-29 14:15:02 +00:00
|
|
|
|
2011-07-07 11:20:53 +02:00
|
|
|
AC_CONFIG_FILES([ m4/Makefile
|
2002-06-29 14:15:02 +00:00
|
|
|
Makefile
|
|
|
|
po/Makefile.in
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 15:46:01 +00:00
|
|
|
gl/Makefile
|
2006-09-20 11:01:49 +00:00
|
|
|
include/Makefile
|
2002-10-19 07:55:27 +00:00
|
|
|
jnlib/Makefile
|
|
|
|
common/Makefile
|
|
|
|
kbx/Makefile
|
2003-06-05 07:14:21 +00:00
|
|
|
g10/Makefile
|
2002-10-19 07:55:27 +00:00
|
|
|
sm/Makefile
|
|
|
|
agent/Makefile
|
|
|
|
scd/Makefile
|
2006-08-16 10:47:53 +00:00
|
|
|
keyserver/Makefile
|
2007-05-04 09:23:51 +00:00
|
|
|
keyserver/gpg2keys_mailto
|
|
|
|
keyserver/gpg2keys_test
|
2006-08-21 20:20:23 +00:00
|
|
|
tools/gpg-zip
|
2003-12-23 11:05:19 +00:00
|
|
|
tools/Makefile
|
2002-06-29 14:15:02 +00:00
|
|
|
doc/Makefile
|
2003-12-23 10:23:16 +00:00
|
|
|
tests/Makefile
|
2006-08-21 20:20:23 +00:00
|
|
|
tests/openpgp/Makefile
|
2008-02-19 10:33:35 +00:00
|
|
|
tests/pkits/Makefile
|
2002-06-29 14:15:02 +00:00
|
|
|
])
|
|
|
|
AC_OUTPUT
|
|
|
|
|
2004-09-30 14:34:34 +00:00
|
|
|
|
2002-10-19 07:55:27 +00:00
|
|
|
echo "
|
2003-04-29 19:05:17 +00:00
|
|
|
GnuPG v${VERSION} has been configured as follows:
|
2011-07-07 11:20:53 +02:00
|
|
|
|
2004-12-02 07:48:09 +00:00
|
|
|
Platform: $PRINTABLE_OS_NAME ($host)
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2002-10-19 07:55:27 +00:00
|
|
|
OpenPGP: $build_gpg
|
|
|
|
S/MIME: $build_gpgsm
|
|
|
|
Agent: $build_agent $build_agent_threaded
|
2003-04-29 19:05:17 +00:00
|
|
|
Smartcard: $build_scdaemon $build_scdaemon_extra
|
2011-01-11 19:35:05 +01:00
|
|
|
Gpgtar: $build_gpgtar
|
2002-10-19 07:55:27 +00:00
|
|
|
|
2004-08-17 15:26:22 +00:00
|
|
|
Protect tool: $show_gnupg_protect_tool_pgm
|
|
|
|
Default agent: $show_gnupg_agent_pgm
|
|
|
|
Default pinentry: $show_gnupg_pinentry_pgm
|
|
|
|
Default scdaemon: $show_gnupg_scdaemon_pgm
|
|
|
|
Default dirmngr: $show_gnupg_dirmngr_pgm
|
2008-02-19 12:58:34 +00:00
|
|
|
"
|
2007-08-27 18:10:27 +00:00
|
|
|
if test x"$use_regex" != xyes ; then
|
|
|
|
echo "
|
|
|
|
Warning: No regular expression support available.
|
|
|
|
OpenPGP trust signatures won't work.
|
|
|
|
gpg-check-pattern will not be build.
|
2002-10-19 07:55:27 +00:00
|
|
|
"
|
2007-08-27 18:10:27 +00:00
|
|
|
fi
|