diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-12-27 19:56:06 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-12-27 19:56:06 +0100 |
commit | e429d0b35f7e505b814c61786bb2df9eff51ab05 (patch) | |
tree | 23a5ba0bcc1ed58ec06f47c2eaab49d11f3493d2 | |
parent | 0dac0485dd4f4deb0463d5ff8a1f9d239cb164e7 (diff) | |
parent | bef0493dbdf370079c188130a13930f428f76b1a (diff) |
Merge branch 'master' of git://dev.medozas.de/libnetfilter_conntrack
-rw-r--r-- | .gitignore | 11 | ||||
-rw-r--r-- | configure.ac | 4 |
2 files changed, 7 insertions, 8 deletions
@@ -1,5 +1,5 @@ -.deps -.libs +.deps/ +.libs/ Makefile Makefile.in *.o @@ -7,14 +7,11 @@ Makefile.in *.lo /aclocal.m4 -/autom4te.cache +/autom4te.cache/ +/build-aux/ /config.* /configure -/depcomp -/install-sh /libtool -/ltmain.sh -/missing /doxygen.cfg /*.pc diff --git a/configure.ac b/configure.ac index eab4a7d..e7d8fcb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,12 @@ dnl Process this file with autoconf to create configure. AC_INIT([libnetfilter_conntrack], [0.9.1]) +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])]) |