[svn] gpgme - r1201 - in trunk: . complus gpgme
svn author wk
cvs at cvs.gnupg.org
Mon Jan 8 13:05:09 CET 2007
Author: wk
Date: 2007-01-08 13:05:07 +0100 (Mon, 08 Jan 2007)
New Revision: 1201
Modified:
trunk/ChangeLog
trunk/complus/Makefile.am
trunk/configure.ac
trunk/gpgme/ChangeLog
trunk/gpgme/engine-gpgsm.c
trunk/gpgme/gpgme.h
trunk/gpgme/op-support.c
trunk/gpgme/rungpg.c
trunk/gpgme/setenv.c
trunk/gpgme/version.c
Log:
Fixes for building without gpgsm and for W32
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-01-05 17:16:03 UTC (rev 1200)
+++ trunk/ChangeLog 2007-01-08 12:05:07 UTC (rev 1201)
@@ -1,3 +1,9 @@
+2007-01-08 Werner Koch <wk at g10code.com>
+
+ * configure.ac: Require gpg-error 1.4 due to the use of
+ gpg_error_from_syserror.
+ (HAVE_ASSUAN_H): New.
+
2007-01-05 Marcus Brinkmann <marcus at g10code.de>
* configure.ac: Add options --with-gpg-version and
Modified: trunk/complus/Makefile.am
===================================================================
--- trunk/complus/Makefile.am 2007-01-05 17:16:03 UTC (rev 1200)
+++ trunk/complus/Makefile.am 2007-01-08 12:05:07 UTC (rev 1201)
@@ -19,11 +19,11 @@
## Process this file with automake to produce Makefile.in
-# Because there is no free IDL compiler for OLE, we have to distribute
-# a binary typelibrary. To generate a new one, copy the idl file to a
-# system with an install MIDL and run the command
-# midl /nocpp gpgcom.idl
-# Sorry, there is no other way yet.
+# Because WIDL does not yet fully support generation of typelibs, we
+# have to distribute a binary type library. To generate a new one,
+# copy the idl file to a system with an install MIDL and run the
+# command "midl /nocpp gpgcom.idl". Sorry, there is no other way yet.
+
EXTRA_DIST = gpgcom.idl gpgcom.tlb gpgcom.rc vbtest.html vbtest.vbs README
# No need to install this because we are cross-compiling anyway.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-01-05 17:16:03 UTC (rev 1200)
+++ trunk/configure.ac 2007-01-08 12:05:07 UTC (rev 1201)
@@ -243,7 +243,7 @@
fi
# Checking for libgpg-error.
-AM_PATH_GPG_ERROR(0.5,, AC_MSG_ERROR([libgpg-error was not found]))
+AM_PATH_GPG_ERROR(1.4,, AC_MSG_ERROR([libgpg-error was not found]))
AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME,
[The default error source for GPGME.])
@@ -458,8 +458,10 @@
# FIXME: Only build if supported.
AM_CONDITIONAL(BUILD_ASSUAN, test "$GPGSM" != "no")
+if test "$GPGSM" != "no"; then
+ AC_DEFINE(HAVE_ASSUAN_H, ,[Defined if we are building with assuan support.])
+fi
-
# The assuan code uses funopen but it will also build without it. So
# test for it. Frankly, this is not required in gpgme, but thats the
# way we handle it in libassuan.
Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog 2007-01-05 17:16:03 UTC (rev 1200)
+++ trunk/gpgme/ChangeLog 2007-01-08 12:05:07 UTC (rev 1201)
@@ -1,3 +1,15 @@
+2007-01-08 Werner Koch <wk at g10code.com>
+
+ * 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.
+
2006-12-17 Marcus Brinkmann <marcus at g10code.de>
* gpgme.c (gpgme_set_protocol): Shut down the engine when
Modified: trunk/gpgme/engine-gpgsm.c
===================================================================
--- trunk/gpgme/engine-gpgsm.c 2007-01-05 17:16:03 UTC (rev 1200)
+++ trunk/gpgme/engine-gpgsm.c 2007-01-08 12:05:07 UTC (rev 1201)
@@ -548,6 +548,7 @@
if (value)
gpgsm->lc_ctype_set = 1;
}
+#ifdef LC_MESSAGES
else if (category == LC_MESSAGES)
{
catstr = "lc-messages";
@@ -556,6 +557,7 @@
if (value)
gpgsm->lc_messages_set = 1;
}
+#endif /* LC_MESSAGES */
else
return gpg_error (GPG_ERR_INV_VALUE);
Modified: trunk/gpgme/gpgme.h
===================================================================
--- trunk/gpgme/gpgme.h 2007-01-05 17:16:03 UTC (rev 1200)
+++ trunk/gpgme/gpgme.h 2007-01-08 12:05:07 UTC (rev 1201)
@@ -72,7 +72,7 @@
AM_PATH_GPGME macro) check that this header matches the installed
library. Warning: Do not edit the next line. configure will do
that for you! */
-#define GPGME_VERSION "1.1.3-cvs1196"
+#define GPGME_VERSION "1.1.3-cvs1200"
Modified: trunk/gpgme/op-support.c
===================================================================
--- trunk/gpgme/op-support.c 2007-01-05 17:16:03 UTC (rev 1200)
+++ trunk/gpgme/op-support.c 2007-01-08 12:05:07 UTC (rev 1201)
@@ -101,9 +101,12 @@
}
err = _gpgme_engine_set_locale (ctx->engine, LC_CTYPE, ctx->lc_ctype);
+#ifdef LC_MESSAGES
if (!err)
err = _gpgme_engine_set_locale (ctx->engine,
LC_MESSAGES, ctx->lc_messages);
+#endif
+
if (err)
{
_gpgme_engine_release (ctx->engine);
Modified: trunk/gpgme/rungpg.c
===================================================================
--- trunk/gpgme/rungpg.c 2007-01-05 17:16:03 UTC (rev 1200)
+++ trunk/gpgme/rungpg.c 2007-01-08 12:05:07 UTC (rev 1201)
@@ -525,6 +525,7 @@
return gpg_error_from_syserror ();
}
}
+#ifdef LC_MESSAGES
else if (category == LC_MESSAGES)
{
if (gpg->lc_messages)
@@ -536,6 +537,7 @@
return gpg_error_from_syserror ();
}
}
+#endif /* LC_MESSAGES */
else
return gpg_error (GPG_ERR_INV_VALUE);
Modified: trunk/gpgme/setenv.c
===================================================================
--- trunk/gpgme/setenv.c 2007-01-05 17:16:03 UTC (rev 1200)
+++ trunk/gpgme/setenv.c 2007-01-08 12:05:07 UTC (rev 1201)
@@ -20,7 +20,11 @@
# include <config.h>
#endif
+#if HAVE_ASSUAN_H
+/* Fixme: Why do we need to include the assuan header and why the
+ internal ones? */
#include "assuan-defs.h"
+#endif /*HAVE_ASSUAN_H*/
#define __builtin_expect(cond,val) (cond)
Modified: trunk/gpgme/version.c
===================================================================
--- trunk/gpgme/version.c 2007-01-05 17:16:03 UTC (rev 1200)
+++ trunk/gpgme/version.c 2007-01-08 12:05:07 UTC (rev 1201)
@@ -32,7 +32,9 @@
/* For _gpgme_sema_subsystem_init (). */
#include "sema.h"
+#ifdef HAVE_ASSUAN_H
#include "assuan.h"
+#endif
/* Bootstrap the subsystems needed for concurrent operation. This
@@ -50,7 +52,9 @@
_gpgme_sema_subsystem_init ();
_gpgme_io_subsystem_init ();
+#ifdef HAVE_ASSUAN_H
assuan_set_assuan_err_source (GPG_ERR_SOURCE_GPGME);
+#endif
done = 1;
}
More information about the Gnupg-commits
mailing list