[svn] GpgOL - r181 - in trunk: . src

[svn author wk]

Author: wk
Date: 2007-09-17 15:10:54 +0200 (Mon, 17 Sep 2007)
New Revision: 181

Modified:
   trunk/ChangeLog
   trunk/autogen.sh
   trunk/src/ChangeLog
   trunk/src/olflange.cpp
Log:
preparing 0.9.92


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-09-17 10:19:38 UTC (rev 180)
+++ trunk/ChangeLog	2007-09-17 13:10:54 UTC (rev 181)
@@ -1,3 +1,7 @@
+2007-09-17  Werner Koch  <wk at g10code.com>
+
+	* autogen.sh (FORCE): Add --force option.
+
 2007-08-13  Marcus Brinkmann  <marcus at g10code.de>
 
 	* configure.ac (svn_revision): Update to latest version from gnupg.

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2007-09-17 10:19:38 UTC (rev 180)
+++ trunk/autogen.sh	2007-09-17 13:10:54 UTC (rev 181)
@@ -39,6 +39,11 @@
 MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
 
 DIE=no
+FORCE=
+if test x"$1" = x"--force"; then
+  FORCE=" --force"
+  shift
+fi
 
 # ***** W32 build script *******
 # Used to cross-compile for Windows.
@@ -151,7 +156,7 @@
 $AUTOHEADER
 echo "Running automake --gnu ..."
 $AUTOMAKE --gnu;
-echo "Running autoconf..."
-$AUTOCONF
+echo "Running autoconf${FORCE} ..."
+$AUTOCONF${FORCE}
 
 echo "You may now run \"./configure --enable-maintainer-mode && make\"."

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2007-09-17 10:19:38 UTC (rev 180)
+++ trunk/src/ChangeLog	2007-09-17 13:10:54 UTC (rev 181)
@@ -1,3 +1,7 @@
+2007-09-17  Werner Koch  <wk at g10code.com>
+
+	* olflange.cpp: Print gpgme version.
+
 2007-09-14  Werner Koch  <wk at g10code.com>
 
 	* engine-gpgme.c: Rewrote most of it.

Modified: trunk/src/olflange.cpp
===================================================================
--- trunk/src/olflange.cpp	2007-09-17 10:19:38 UTC (rev 180)
+++ trunk/src/olflange.cpp	2007-09-17 13:10:54 UTC (rev 181)
@@ -434,6 +434,7 @@
   if (!version_shown)
     {
       version_shown = 1;
+      log_debug ("%s:%s: using gpgme %s\n", gpgme_check_version (NULL));
       log_debug ("%s:%s: detected Outlook build version 0x%lx (%lu.%lu)\n",
                  SRCNAME, __func__, lBuildVersion,
                  (lBuildVersion & EECBGV_BUILDVERSION_MAJOR_MASK) >> 16,