conntrack-tools: build updates

conntrack-tools: build updates

[Jan Engelhardt]

The following changes since commit 482c167dffd033915f693c13eb3c47e6f6f77a27:

  conntrackd: add missing initial caching of gettimeofday() (2011-10-24 12:01:26 +0200)

are available in the git repository at:
  git://dev.medozas.de/conntrack-tools master

Jan Engelhardt (3):
      Update .gitignore
      build: use AC_CONFIG_AUX_DIR and stash away tools
      build: disable implicit .tar.gz archive generation and use POSIX mode

 .gitignore   |   12 ++++--------
 configure.ac |    5 +++--
 2 files changed, 7 insertions(+), 10 deletions(-)

[PATCH 1/3] Update .gitignore

[Jan Engelhardt]

Only ignore these paths if they are a directory.
---
 .gitignore |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 444c4b3..7de29d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-.deps
-.libs
+.deps/
+.libs/
 Makefile
 Makefile.in
 *.o
@@ -7,7 +7,7 @@ Makefile.in
 *.lo
 
 /aclocal.m4
-/autom4te.cache
+/autom4te.cache/
 /config.*
 /configure
 /depcomp
-- 
1.7.3.4

[PATCH 2/3] build: use AC_CONFIG_AUX_DIR and stash away tools

[Jan Engelhardt]

---
 .gitignore   |    6 +-----
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7de29d0..928e44b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,11 +8,7 @@ Makefile.in
 
 /aclocal.m4
 /autom4te.cache/
+/build-aux/
 /config.*
 /configure
-/depcomp
-/install-sh
 /libtool
-/ltmain.sh
-/missing
-/ylwrap
diff --git a/configure.ac b/configure.ac
index 64d354f..3d536d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_INIT(conntrack-tools, 1.0.0, pablo@netfilter.org)
+AC_CONFIG_AUX_DIR([build-aux])
 
 AC_CANONICAL_HOST
-
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6])
 
-- 
1.7.3.4

[PATCH 3/3] build: disable implicit .tar.gz archive generation and use POSIX mode

[Jan Engelhardt]

---
 configure.ac |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3d536d5..22582b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,8 @@ AC_CONFIG_AUX_DIR([build-aux])
 
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6])
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects
+	tar-pax no-dist-gzip dist-bzip2 1.6])
 
 dnl kernel style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-- 
1.7.3.4

Re: conntrack-tools: build updates

[Pablo Neira Ayuso]

On Sat, Dec 17, 2011 at 04:37:53PM +0100, Jan Engelhardt wrote:
> 
> The following changes since commit 482c167dffd033915f693c13eb3c47e6f6f77a27:
> 
>   conntrackd: add missing initial caching of gettimeofday() (2011-10-24 12:01:26 +0200)
> 
> are available in the git repository at:
>   git://dev.medozas.de/conntrack-tools master
> 
> Jan Engelhardt (3):
>       Update .gitignore
>       build: use AC_CONFIG_AUX_DIR and stash away tools
>       build: disable implicit .tar.gz archive generation and use POSIX mode

Also, applied. Thanks.