* Makefile.am (AUTOMAKE_OPTIONS): Build bzip 2 version

(ACLOCAL_AMFLAGS): Add -I m4

diff --git a/branches/gpgme-1-0-branch/ChangeLog b/branches/gpgme-1-0-branch/ChangeLog
index 7a2208eb7f51815a1d02aef1379f6ec5047f386a..76cd8e80137babc3f17576aab18b35f386797ed1 100644 (file)
--- a/branches/gpgme-1-0-branch/ChangeLog
+++ b/branches/gpgme-1-0-branch/ChangeLog
@@ -2,6 +2,8 @@
 
        Released 1.0.2.
 
+       * Makefile.am (AUTOMAKE_OPTIONS): Build bzip 2 version
+       (ACLOCAL_AMFLAGS): Add -I m4
        * configure.ac: Require automake 1.9.3 and autoconf 2.59.
        * acinclude.m4: Changed quoting for automake 1.9.
        * README: Use SHA1 instead of MD5.

diff --git a/branches/gpgme-1-0-branch/Makefile.am b/branches/gpgme-1-0-branch/Makefile.am
index 69c1bbd79377a4985cc297676118ab93809e1ba4..be58c345aa6af32670986cd1d668fc65cb5e6169 100644 (file)
--- a/branches/gpgme-1-0-branch/Makefile.am
+++ b/branches/gpgme-1-0-branch/Makefile.am
@@ -20,6 +20,9 @@
 
 ## Process this file with automake to produce Makefile.in
 
+ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = dist-bzip2
+
 EXTRA_DIST = gpgme.spec.in
 
 if BUILD_ASSUAN