(no commit message)

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 0f4af8cf3b28e04e72b7014c583428ed40aa05c0..f6a0f2d9a40211efe705765b91076e20cee648d3 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-30  Marcus Brinkmann  <marcus@g10code.de>
+
+       * configure.ac: Bump required version of automake up to 1.10.
+       * autogen.sh: Fix aclocal check.
+
 2008-01-04  Marcus Brinkmann  <marcus@g10code.de>
 
        Release GPGME 1.1.6.

diff --git a/trunk/autogen.sh b/trunk/autogen.sh
index ffe46b4d189ca9ff282f7a8db7452eb8ddc5a41a..b88b6722fbf0f43602ac93deb74f413a29914724 100755 (executable)
--- a/trunk/autogen.sh
+++ b/trunk/autogen.sh
@@ -134,7 +134,7 @@ if check_version $AUTOCONF $autoconf_vers_num $autoconf_vers ; then
     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

diff --git a/trunk/configure.ac b/trunk/configure.ac
index 5847362b587965949aba0ed0f156350d3dca2756..5016b1c288ae638bf3b0d5fc0a0a75faa3751101 100644 (file)
--- a/trunk/configure.ac
+++ b/trunk/configure.ac
@@ -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"

diff --git a/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h
index 1133e0d38ecac3dd2c46a04118a5c488fdec0adb..12ddee8a019d1110c0fd9929cba558f6de81cdb3 100644 (file)
--- a/trunk/gpgme/gpgme.h
+++ b/trunk/gpgme/gpgme.h
@@ -72,7 +72,7 @@ extern "C" {
    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"
 
 
 \f