[svn] gpgme - r1301 - in trunk: . gpgme

[svn author marcus]

Author: marcus
Date: 2008-01-30 15:17:26 +0100 (Wed, 30 Jan 2008)
New Revision: 1301

Modified:
   trunk/ChangeLog
   trunk/autogen.sh
   trunk/configure.ac
   trunk/gpgme/gpgme.h
Log:


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-01-30 13:24:21 UTC (rev 1300)
+++ trunk/ChangeLog	2008-01-30 14:17:26 UTC (rev 1301)
@@ -1,3 +1,8 @@
+2008-01-30  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac: Bump required version of automake up to 1.10.
+	* autogen.sh: Fix aclocal check.
+
 2008-01-04  Marcus Brinkmann  <marcus at g10code.de>
 
 	Release GPGME 1.1.6.

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2008-01-30 13:24:21 UTC (rev 1300)
+++ trunk/autogen.sh	2008-01-30 14:17:26 UTC (rev 1301)
@@ -134,7 +134,7 @@
     check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf
 fi
 if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
-  check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
+    check_version $ACLOCAL $automake_vers_num $automake_vers automake
 fi
 #if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
 #  check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-01-30 13:24:21 UTC (rev 1300)
+++ trunk/configure.ac	2008-01-30 14:17:26 UTC (rev 1301)
@@ -20,7 +20,7 @@
  
 # (Process this file with autoconf to produce a configure script.)
 AC_PREREQ(2.59)
-min_automake_version="1.9.3"
+min_automake_version="1.10"
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Make sure to run  "svn up" and "./autogen.sh --force"

Modified: trunk/gpgme/gpgme.h
===================================================================
--- trunk/gpgme/gpgme.h	2008-01-30 13:24:21 UTC (rev 1300)
+++ trunk/gpgme/gpgme.h	2008-01-30 14:17:26 UTC (rev 1301)
@@ -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.7-svn1295"
+#define GPGME_VERSION "1.1.7-svn1300"