ulogd2: build updates

ulogd2: build updates

[Jan Engelhardt]

The following changes since commit 1aa4c6135545ee8107584406f9d865d13c65a5ce:

  pcap: add file option to configuration file (2011-09-01 17:09:16 +0200)

are available in the git repository at:
  git://dev.medozas.de/ulogd2 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   |   11 ++++-------
 configure.ac |    4 ++--
 2 files changed, 6 insertions(+), 9 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 6c7f08c..cf1c1da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,8 @@
 *.la
 *.lo
 *.o
-.deps
-.libs
+.deps/
+.libs/
 Makefile
 Makefile.in
 
@@ -13,7 +13,7 @@ Makefile.in
 
 # build system
 /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   |    5 +----
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index cf1c1da..f1348b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,11 +14,8 @@ Makefile.in
 # build system
 /aclocal.m4
 /autom4te.cache/
+/build-aux/
 /config.*
 /configure
-/depcomp
-/install-sh
 /libtool
-/ltmain.sh
-/missing
 /stamp-h1
diff --git a/configure.ac b/configure.ac
index e8f8427..5bb032e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.50])
 AC_INIT([ulogd], [2.0.0beta4])
-
+AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2 1.10b])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
-- 
1.7.3.4

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

[Jan Engelhardt]

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

diff --git a/configure.ac b/configure.ac
index 5bb032e..132cdbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.50])
 AC_INIT([ulogd], [2.0.0beta4])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2 1.10b])
+AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2 1.10b])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-- 
1.7.3.4

Re: ulogd2: build updates

[Pablo Neira Ayuso]

On Sat, Dec 17, 2011 at 04:39:18PM +0100, Jan Engelhardt wrote:
> 
> The following changes since commit 1aa4c6135545ee8107584406f9d865d13c65a5ce:
> 
>   pcap: add file option to configuration file (2011-09-01 17:09:16 +0200)
> 
> are available in the git repository at:
>   git://dev.medozas.de/ulogd2 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   |   11 ++++-------
>  configure.ac |    4 ++--
>  2 files changed, 6 insertions(+), 9 deletions(-)

Applied, thanks.

ulogd2 build updates

[Jan Engelhardt]

The following changes since commit 1521d3de58250a9c475995f611bd2cae14741fb2:

  Add helper script pcap2ulog (2010-10-23 11:48:06 +0200)

are available in the git repository at:
  git://dev.medozas.de/ulogd2 master

Jan Engelhardt (9):
      build: move global automake options into configure.ac
      build: remove statements without obvious effect
      build: remove -fPIC flag
      build: remove unused $(all_includes)
      output/LOGEMU: resolve build warning
      build: default to not building static libraries
      build: propagate global CFLAGS
      build: no need for error message in PKG_CHECK_MODULES
      filter/HWHDR: remove redundant sizeof(char)

 Makefile.am                   |    7 +------
 configure.ac                  |   19 +++++++------------
 filter/Makefile.am            |    3 ++-
 filter/raw2packet/Makefile.am |    3 ++-
 filter/ulogd_filter_HWHDR.c   |    2 +-
 input/flow/Makefile.am        |    4 ++--
 input/packet/Makefile.am      |    4 ++--
 libipulog/Makefile.am         |    5 ++---
 output/Makefile.am            |    3 ++-
 output/dbi/Makefile.am        |    3 ++-
 output/mysql/Makefile.am      |    3 ++-
 output/pcap/Makefile.am       |    3 ++-
 output/pgsql/Makefile.am      |    3 ++-
 output/sqlite3/Makefile.am    |    3 ++-
 output/ulogd_output_LOGEMU.c  |    2 +-
 src/Makefile.am               |    3 ++-
 16 files changed, 34 insertions(+), 36 deletions(-)

Re: ulogd2 build updates

[Pablo Neira Ayuso]

On 05/11/10 19:36, Jan Engelhardt wrote:
> The following changes since commit 1521d3de58250a9c475995f611bd2cae14741fb2:
> 
>   Add helper script pcap2ulog (2010-10-23 11:48:06 +0200)
> 
> are available in the git repository at:
>   git://dev.medozas.de/ulogd2 master

I have applied this as well, thanks Jan.