[Gpa-commits] r731 - trunk

[scm-commit at wald.intevation.org]

Author: werner
Date: 2006-01-09 11:06:39 +0100 (Mon, 09 Jan 2006)
New Revision: 731

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
Log:
configure fixes


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-01-06 19:46:30 UTC (rev 730)
+++ trunk/ChangeLog	2006-01-09 10:06:39 UTC (rev 731)
@@ -1,3 +1,9 @@
+2006-01-09  Werner Koch  <wk at g10code.com>
+
+	Released 0.7.1.
+
+	* configure.ac: Check for gpgme-glib only under W32.
+
 2006-01-03  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Require just gpgme 1.1.1 as 1.2.0 was unintentional.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-01-06 19:46:30 UTC (rev 730)
+++ trunk/NEWS	2006-01-09 10:06:39 UTC (rev 731)
@@ -1,21 +1,23 @@
-Noteworthy changes in version 0.7.1 (unreleased)
+Noteworthy changes in version 0.7.1 (2006-01-09)
 ------------------------------------------------
 
  * When verifying the signature on a file, GPA now tries to find
- detached signatures and asks the user whether to verify them.
+   detached signatures and asks the user whether to verify them.
 
  * A "refresh" command was added to the keyring. So, if the keyring is
- modified outside GPA (i.e. by reading emails with auto-key-retrieve
- on), you can see the new keys without restarting GPA.
+   modified outside GPA (i.e. by reading emails with auto-key-retrieve
+   on), you can see the new keys without restarting GPA.
 
  * A .desktop file for integration with the Gnome and KDE menus is now
- distributed with the tarball.
+   distributed with the tarball.
 
- * The GPA icon has been changed. The new icon is now used by all windows
- when minimized (and on the window title if supported by the window
- manager).
+ * The GPA icon has been changed. The new icon is now used by all
+   windows when minimized (and on the window title if supported by the
+   window manager).
 
- * It is again possible to do a build for Windows.
+ * It is again possible to do a build for Windows using the latest
+   glib version along with a glib patch as available in the gpg4win
+   package.
 
 
 Noteworthy changes in version 0.7.0 (2003-10-22)

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-01-06 19:46:30 UTC (rev 730)
+++ trunk/configure.ac	2006-01-09 10:06:39 UTC (rev 731)
@@ -17,8 +17,8 @@
 # for snapshot releases please do an "svn up" right before recreating
 # the configure script, so that a proper revision number for all files
 # is available when running a "make distcheck".
-m4_define(my_version, [0.7.1])
-m4_define(my_iscvs, yes)
+m4_define(my_version, [0.7.2])
+#m4_define(my_iscvs, yes)
 
 
 AC_INIT([gpa], my_version[]m4_ifdef([my_iscvs], [-cvs[]m4_translit(
@@ -169,11 +169,23 @@
             CFLAGS="$CFLAGS $GTK_CFLAGS"],
             AC_MSG_ERROR(Cannot find GTK+ 2.0))
 
-AM_PATH_GPGME_GLIB(1.1.1,
+#
+# Depending on the OS we need to test for different versions of gpgme.
+#
+_AM_PATH_GPGME_CONFIG
+if test "$have_w32_system" = yes; then
+  AM_PATH_GPGME_GLIB([1:1.1.1],
             [LIBS="$LIBS $GPGME_GLIB_LIBS"
             CFLAGS="$CFLAGS $GPGME_GLIB_CFLAGS"],
             AC_MSG_ERROR(Cannot find an up to date GPGME))
+else
+  AM_PATH_GPGME([1:1.1.1],
+            [LIBS="$LIBS $GPGME_LIBS"
+             CFLAGS="$CFLAGS $GPGME_CFLAGS"],
+            AC_MSG_ERROR(Cannot find an up to date GPGME))
+fi
 
+
 dnl
 dnl Checks for typedefs and structures
 dnl