[conntrack-tools PATCH 0/3] bison & flex autotools updates

[conntrack-tools PATCH 0/3] bison & flex autotools updates

[Jeremy Sowden]

The first two patches bring the use of bison and flex and their
generated files more into line with the recommendations of automake.
The third fixes an autoconf deprecation warning.

Jeremy Sowden (3):
  build: only require bison and flex if the generated files do not exist
  build: remove MAINTAINERCLEANFILES
  build: replace `AM_PROG_LEX` with `AC_PROG_LEX`

 configure.ac    | 6 +++---
 src/Makefile.am | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

-- 
2.34.1

[conntrack-tools PATCH 1/3] build: only require bison and flex if the generated files do not exist

[Jeremy Sowden]

automake recommends including the files generated by bison and flex in
distribution tar-balls and runs bison and flex during `make dist` to
generate them.  Thus, in the normal case where the software is being
compiled by an end-user, the generated files already exist and bison and
flex are not required.  Therefore, amend the configure script only to
require them if the generated files do not exist.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3a3af4549162..a20c6bb4ca1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,13 +26,13 @@ case "$host" in
 esac
 
 dnl Dependencies
-if test -z "$ac_cv_prog_YACC"
+if test -z "$ac_cv_prog_YACC" -a ! -f "${srcdir}/src/read_config_yy.c"
 then
 	echo "*** Error: No suitable bison/yacc found. ***"
 	echo "    Please install the 'bison' package."
 	exit 1
 fi
-if test -z "$ac_cv_prog_LEX"
+if test -z "$ac_cv_prog_LEX" -a ! -f "${srcdir}/src/read_config_lex.c"
 then
 	echo "*** Error: No suitable flex/lex found. ***"
 	echo "    Please install the 'flex' package."
-- 
2.34.1

[conntrack-tools PATCH 2/3] build: remove MAINTAINERCLEANFILES

[Jeremy Sowden]

automake generates rules to remove the files generated by bison
and flex by default, so there is no need to add them explicitly to
MAINTAINERCLEANFILES.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 src/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 1f234749d35d..1d56394698a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,6 @@ endif
 AM_YFLAGS = -d
 
 BUILT_SOURCES = read_config_yy.h
-MAINTAINERCLEANFILES = read_config_yy.c read_config_yy.h read_config_lex.c
 
 sbin_PROGRAMS = conntrack conntrackd nfct
 
-- 
2.34.1

[conntrack-tools PATCH 3/3] build: replace `AM_PROG_LEX` with `AC_PROG_LEX`

[Jeremy Sowden]

`AM_PROG_LEX` calls `AC_PROG_LEX` with no arguments, but this usage is
deprecated.  The only difference between `AM_PROG_LEX` and `AC_PROG_LEX`
is that the former defines `$LEX` as "./build-aux/missing lex" if no lex
is found to ensure a useful error is reported when make is run.  How-
ever, the configure script checks that we have a working lex and exits
with an error if none is available, so `$LEX` will never be called and
we can replace `AM_PROG_LEX` with `AC_PROG_LEX`.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index a20c6bb4ca1c..b12b722a3396 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AM_PROG_AR
 LT_INIT([disable-static])
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AM_PROG_LEX
+AC_PROG_LEX([noyywrap])
 AC_PROG_YACC
 
 case "$host" in
-- 
2.34.1

Re: [conntrack-tools PATCH 0/3] bison & flex autotools updates

[Pablo Neira Ayuso]

On Thu, Dec 16, 2021 at 05:05:10PM +0000, Jeremy Sowden wrote:
> The first two patches bring the use of bison and flex and their
> generated files more into line with the recommendations of automake.
> The third fixes an autoconf deprecation warning.

Series applied, thanks