diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2010-11-05 18:52:24 +0100 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2010-11-05 18:52:44 +0100 |
| commit | 04745ac3d5eca6f009198438c40a60639be13f7b (patch) | |
| tree | b666f6b2f569d6a72762b885a7601e4df3940c7c /configure.ac | |
| parent | 38d01668739df60471baedc9084a7d118aca778e (diff) | |
| download | conntrack-tools-04745ac3d5eca6f009198438c40a60639be13f7b.tar.gz conntrack-tools-04745ac3d5eca6f009198438c40a60639be13f7b.zip | |
build: remove redundant bison/lex tests
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>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | 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. |