From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 4 Jun 2016 22:24:28 +0000 (+0200)
Subject: automake: disable gzipped tarballs
X-Git-Tag: collectd-5.6.0~232
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=62bff38f8315bb5123dc7a928495fc3427a87854;p=collectd.git

automake: disable gzipped tarballs

We only use bz2.

Fixes make distcheck on FreeBSD-11-CURRENT

test -n ""  || find "collectd-5.5.1.1086.g41e7c34" -type d ! -perm -755  -exec chmod u+rwx,go+rx {} \; -o  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o  ! -type d ! -perm -400 -exec chmod a+r {} \; -o  ! -type d ! -perm -444 -exec /bin/sh /home/ruben/src/collectd/libltdl/config/install-sh -c -m a+r {} {} \;  || chmod -R a+r "collectd-5.5.1.1086.g41e7c34"
tardir=collectd-5.5.1.1086.g41e7c34 && tar --format=posix -chf - "$tardir" | BZIP2=${BZIP2--9} bzip2 -c >collectd-5.5.1.1086.g41e7c34.tar.bz2
tardir=collectd-5.5.1.1086.g41e7c34 && tar --format=posix -chf - "$tardir" | GZIP=--best gzip -c >collectd-5.5.1.1086.g41e7c34.tar.gz
if test -d "collectd-5.5.1.1086.g41e7c34"; then  find "collectd-5.5.1.1086.g41e7c34" -type d ! -perm -200 -exec chmod u+w {} ';'  && rm -rf "collectd-5.5.1.1086.g41e7c34"  || { sleep 5 && rm -rf "collectd-5.5.1.1086.g41e7c34"; };  else :; fi
case 'collectd-5.5.1.1086.g41e7c34.tar.gz collectd-5.5.1.1086.g41e7c34.tar.bz2' in  *.tar.gz*)  GZIP=--best gzip -dc collectd-5.5.1.1086.g41e7c34.tar.gz | tar -xf - ;; *.tar.bz2*)  bzip2 -dc collectd-5.5.1.1086.g41e7c34.tar.bz2 | tar -xf - ;; *.tar.lz*)  lzip -dc collectd-5.5.1.1086.g41e7c34.tar.lz | tar -xf - ;; *.tar.xz*)  xz -dc collectd-5.5.1.1086.g41e7c34.tar.xz | tar -xf - ;; *.tar.Z*)  uncompress -c collectd-5.5.1.1086.g41e7c34.tar.Z | tar -xf - ;; *.shar.gz*)  GZIP=--best gzip -dc collectd-5.5.1.1086.g41e7c34.shar.gz | unshar ;; *.zip*)  unzip collectd-5.5.1.1086.g41e7c34.zip ;; esac
tar: Parse error: SCHILY.acl.default
tar: Parse error: SCHILY.acl.default
tar: Error exit delayed from previous errors.
*** Error code 1

Stop.
make: stopped in /usr/home/ruben/src/collectd
---

diff --git a/configure.ac b/configure.ac
index 4816c751..a85d2e17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ m4_ifdef([LT_PACKAGE_VERSION],
 
 AM_CONDITIONAL([BUILD_INCLUDED_LTDL], [test "x$LTDLDEPS" != "x"])
 
-AM_INIT_AUTOMAKE([subdir-objects tar-pax dist-bzip2 foreign])
+AM_INIT_AUTOMAKE([subdir-objects tar-pax dist-bzip2 no-dist-gzip foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_LANG(C)