netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Engelhardt <jengelh@medozas.de>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 5/5] build: remove redundant bison/lex tests
Date: Fri,  5 Nov 2010 18:56:53 +0100	[thread overview]
Message-ID: <1288979814-18512-6-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1288979814-18512-1-git-send-email-jengelh@medozas.de>

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


  parent reply	other threads:[~2010-11-05 17:57 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-05 17:56 conntrack-tools build updates 2 Jan Engelhardt
2010-11-05 17:56 ` [PATCH 1/5] build: resolve automake warning Jan Engelhardt
2010-11-05 17:56 ` [PATCH 2/5] build: default to not building static libraries Jan Engelhardt
2010-11-05 17:56 ` [PATCH 3/5] build: run autoupdate to replace obsolete constructs Jan Engelhardt
2010-11-05 17:56 ` [PATCH 4/5] build: use AM_YFLAGS instead of overriding YACC Jan Engelhardt
2010-11-05 17:56 ` Jan Engelhardt [this message]
2010-11-07 19:52 ` conntrack-tools build updates 2 Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1288979814-18512-6-git-send-email-jengelh@medozas.de \
    --to=jengelh@medozas.de \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).