LIBGCRYPT-1-2-BRANCH libgcrypt (ChangeLog Makefile.am configure.ac)

[cvs user wk]

    Date: Tuesday, January 4, 2005 @ 21:56:46
  Author: wk
    Path: /cvs/libgcrypt/libgcrypt
     Tag: LIBGCRYPT-1-2-BRANCH

Modified: ChangeLog Makefile.am configure.ac

Build a bzip archive; require new autotools


--------------+
 ChangeLog    |    3 +++
 Makefile.am  |    2 ++
 configure.ac |    6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)


Index: libgcrypt/ChangeLog
diff -u libgcrypt/ChangeLog:1.158.2.3 libgcrypt/ChangeLog:1.158.2.4
--- libgcrypt/ChangeLog:1.158.2.3	Tue Jan  4 21:50:23 2005
+++ libgcrypt/ChangeLog	Tue Jan  4 21:56:46 2005
@@ -1,5 +1,8 @@
 2005-01-04  Werner Koch  <wk at g10code.com>
 
+	* Makefile.am (ACLOCAL_AMFLAGS): New for -I m4.
+	(AUTOMAKE_OPTIONS): New to create a bzip archive.
+
 	Updated to automake 1.9.
 	
 	* acinclude.m4:  Updated for automake 1.9.
Index: libgcrypt/Makefile.am
diff -u libgcrypt/Makefile.am:1.55 libgcrypt/Makefile.am:1.55.2.1
--- libgcrypt/Makefile.am:1.55	Mon Dec  8 22:43:02 2003
+++ libgcrypt/Makefile.am	Tue Jan  4 21:56:46 2005
@@ -17,6 +17,8 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
+ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = dist-bzip2
 
 DIST_SUBDIRS = mpi cipher src doc tests w32-dll
 SUBDIRS = mpi cipher src doc tests
Index: libgcrypt/configure.ac
diff -u libgcrypt/configure.ac:1.70.2.2 libgcrypt/configure.ac:1.70.2.3
--- libgcrypt/configure.ac:1.70.2.2	Fri Sep  3 21:43:27 2004
+++ libgcrypt/configure.ac	Tue Jan  4 21:56:46 2005
@@ -19,9 +19,9 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # (Process this file with autoconf to produce a configure script.)
-AC_REVISION($Revision: 1.70.2.2 $)
-AC_PREREQ(2.57)
-min_automake_version="1.7.6"
+AC_REVISION($Revision: 1.70.2.3 $)
+AC_PREREQ(2.59)
+min_automake_version="1.9.3"
 
 # Version number: Remember to change it immediately *after* a release
 # but remove a "-cvs" prefix right *before* a release and append it