From cc5190ffc1bdef706df2d6fe7e1e5491fb28c708 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 10 Jan 2007 10:18:05 +0000 Subject: / * configure.ac (NEED_GPG_VERSION, (NEED_GPGSM_VERSION): Must define after it may have been changed by an option. * configure.ac: Require gpg-error 1.4 due to the use of gpg_error_from_syserror. (HAVE_ASSUAN_H): New. gpgme/ * ttyname_r.c (ttyname_r) [W32]: Return a dummy name. * version.c (do_subsystem_inits): Do assuan init only if building with Assuan. * setenv.c: Include assuan-def.h only if building with Assuan support. * op-support.c (_gpgme_op_reset): Set LC_MESSAGES only if if defined. * engine-gpgsm.c (gpgsm_set_locale): Ditto. * rungpg.c (gpg_set_locale): Ditto. --- configure.ac | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 2e3c4e7b..09384b8a 100644 --- a/configure.ac +++ b/configure.ac @@ -87,10 +87,6 @@ AC_PROG_CC AC_SUBST(LIBGPGME_LT_CURRENT) AC_SUBST(LIBGPGME_LT_AGE) AC_SUBST(LIBGPGME_LT_REVISION) -AC_DEFINE_UNQUOTED(NEED_GPG_VERSION, "$NEED_GPG_VERSION", - [Min. needed GnuPG version.]) -AC_DEFINE_UNQUOTED(NEED_GPGSM_VERSION, "$NEED_GPGSM_VERSION", - [Min. needed GPGSM version.]) AC_SUBST(PACKAGE) AC_SUBST(VERSION) @@ -273,6 +269,11 @@ if test "$NEED_GPGSM_VERSION" = "no"; then NEED_GPGSM_VERSION=0.0.0 fi +AC_DEFINE_UNQUOTED(NEED_GPG_VERSION, "$NEED_GPG_VERSION", + [Min. needed GnuPG version.]) +AC_DEFINE_UNQUOTED(NEED_GPGSM_VERSION, "$NEED_GPGSM_VERSION", + [Min. needed GPGSM version.]) + NO_OVERRIDE=no AC_ARG_WITH(gpg, -- cgit v1.2.3