conntrack-tools build updates 2

conntrack-tools build updates 2

[Jan Engelhardt]

The following changes since commit 89189d0799a158cab83c564f57aaa9942a4cc19e:

  Add .gitignore files (2010-10-31 00:46:35 +0200)

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

Jan Engelhardt (5):
      build: resolve automake warning
      build: default to not building static libraries
      build: run autoupdate to replace obsolete constructs
      build: use AM_YFLAGS instead of overriding YACC
      build: remove redundant bison/lex tests

 configure.ac    |   22 ++++++++++------------
 src/Makefile.am |    4 ++--
 2 files changed, 12 insertions(+), 14 deletions(-)

[PATCH 1/5] build: resolve automake warning

[Jan Engelhardt]

src/Makefile.am:24: whitespace following trailing backslash

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 src/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index a85a56f..10b3467 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ conntrackd_SOURCES = alarm.c main.c run.c hash.c queue.c rbtree.c \
 		    channel.c multichannel.c channel_mcast.c channel_udp.c \
 		    tcp.c channel_tcp.c \
 		    external_cache.c external_inject.c \
-		    internal_cache.c internal_bypass.c \ 
+		    internal_cache.c internal_bypass.c \
 		    read_config_yy.y read_config_lex.l
 
 # yacc and lex generate dirty code
-- 
1.7.1

[PATCH 2/5] build: default to not building static libraries

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 configure.ac |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 37fbeee..1d5ac2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6])
 
 AC_PROG_CC
+AC_DISABLE_STATIC
 AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
-- 
1.7.1

[PATCH 3/5] build: run autoupdate to replace obsolete constructs

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 configure.ac |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1d5ac2b..7f9110a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,8 +65,7 @@ AC_CHECK_FUNCS(inet_pton)
 dnl Some systems have it, but not IPv6
 if test "$ac_cv_func_inet_pton" = "yes" ; then
 AC_MSG_CHECKING(if inet_pton supports IPv6)
-AC_TRY_RUN(
-   [
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -87,9 +86,9 @@ int main()
      else
         exit(0);
   }
-  ], [ AC_MSG_RESULT(yes)
+  ]])],[ AC_MSG_RESULT(yes)
        AC_DEFINE_UNQUOTED(HAVE_INET_PTON_IPV6, 1, [Define to 1 if inet_pton supports IPv6.])
-  ], AC_MSG_RESULT(no), AC_MSG_RESULT(no))
+  ],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
 fi
 
 # Checks for header files.
-- 
1.7.1

[PATCH 4/5] build: use AM_YFLAGS instead of overriding YACC

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 src/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 10b3467..70e496d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Make_global.am
 
-YACC=@YACC@ -d
+AM_YFLAGS = -d
 
 CLEANFILES = read_config_yy.c read_config_lex.c
 
-- 
1.7.1

[PATCH 5/5] build: remove redundant bison/lex tests

[Jan Engelhardt]

AC_PROG_{LEX,YACC} already searches for the programs, so no need to do
it again with AC_CHECK_PROGS.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 configure.ac |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7f9110a..47a3660 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,18 +19,13 @@ case "$host" in
 esac
 
 dnl Dependencies
-PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.0])
-PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 0.0.102])
-
-AC_CHECK_PROGS(XYACC,$YACC bison yacc,none)
-if test "$XYACC" = "none"
+if test -z "$ac_cv_prog_YACC"
 then
 	echo "*** Error: No suitable bison/yacc found. ***"
 	echo "    Please install the 'bison' package."
 	exit 1
 fi
-AC_CHECK_PROGS(XLEX,$LEX flex lex,none)
-if test "$XLEX" = "none"
+if test -z "$ac_cv_prog_LEX"
 then
 	echo "*** Error: No suitable flex/lex found. ***"
 	echo "    Please install the 'flex' package."
@@ -38,7 +33,7 @@ then
 fi
 
 AC_MSG_CHECKING(flex version)
-flex_version=`$LEX --version | sed 's/version//g' | awk '/flex/ {print $2}'`
+flex_version=`$ac_cv_prog_LEX --version | sed 's/version//g' | awk '/flex/ {print $2}'`
 flex_major=`echo $flex_version| cut -d . -f 1`
 flex_minor=`echo $flex_version| cut -d . -f 2`
 flex_rev=`echo $flex_version| cut -d . -f 3`
@@ -52,6 +47,9 @@ else
 	flex.])
 fi
 
+PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.0])
+PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 0.0.102])
+
 AC_CHECK_HEADERS([linux/capability.h],, [AC_MSG_ERROR([Cannot find linux/capabibility.h])])
 
 # Checks for libraries.
-- 
1.7.1

Re: conntrack-tools build updates 2

[Pablo Neira Ayuso]

On 05/11/10 18:56, Jan Engelhardt wrote:
> git://dev.medozas.de/conntrack-tools master

Pulled and pushed