summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac2
-rw-r--r--gpgme/gpgme.h2
4 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f4af8cf..f6a0f2d9 100644
--- a/ChangeLog
+++ b/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/autogen.sh b/autogen.sh
index ffe46b4d..b88b6722 100755
--- a/autogen.sh
+++ b/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/configure.ac b/configure.ac
index 5847362b..5016b1c2 100644
--- a/configure.ac
+++ b/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/gpgme/gpgme.h b/gpgme/gpgme.h
index 1133e0d3..12ddee8a 100644
--- a/gpgme/gpgme.h
+++ b/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"