Skip to content

Commit

Permalink
Fixed remaining ./configure --disable-xxxx issues.
Browse files Browse the repository at this point in the history
Corrected use of $enabled_xxxx vs $build_xxxx where appropriete.
  • Loading branch information
chadf committed Oct 17, 2023
1 parent ce7ff2c commit 622670b
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,10 @@ build_ftconv="yes" , build_ftconv="no"
AM_CONDITIONAL([FT2NFDUMP], [test "x$build_ftconv" = "xyes"])

AC_ARG_ENABLE(maxmind,
[ --enable-maxmind Build geolookup for MaxMind GeoDB; default is NO],
use_maxmind="yes" , use_maxmind="no"
)
AM_CONDITIONAL([MAXMIND], [test "x$use_maxmind" = "xyes"])
[ --enable-maxmind Build geolookup for MaxMind GeoDB; default is NO])

build_maxmind="$enable_maxmind" # No dependencies
AM_CONDITIONAL([MAXMIND], [test "x$build_maxmind" = "xyes"])

#Needs tidy
AC_ARG_ENABLE(nfprofile,
Expand Down Expand Up @@ -210,9 +210,9 @@ build_nfprofile="no"
)
AM_CONDITIONAL([NFPROFILE], [test "x$build_nfprofile" = "xyes"])

AC_ARG_ENABLE(influxdb, [AS_HELP_STRING([--enable-influxdb], [enable stats to influxdb (default is no)])], [
influxdb=${enableval} ], [influxdb=no])
AS_IF([test "x$influxdb" = xyes], [
AC_ARG_ENABLE(influxdb, [AS_HELP_STRING([--enable-influxdb], [enable stats to influxdb (default is no)])])

AS_IF([test "x$enable_influxdb" = xyes], [
PKG_CHECK_MODULES([curl], [libcurl],,
[AC_MSG_ERROR([No pkg-config for libcurl])])
AC_SUBST(CURL_CFLAGS)
Expand Down Expand Up @@ -268,10 +268,10 @@ AM_CONDITIONAL(NFTRACK, false)
)

AC_ARG_ENABLE(sflow,
[ --enable-sflow Build sflow collector sfcpad; default is NO],
build_sflow="yes", build_sflow="no"
)
AM_CONDITIONAL(SFLOW, test "$enable_sflow" = yes)
[ --enable-sflow Build sflow collector sfcpad; default is NO])

build_sflow="$enable_sflow" # No dependencies
AM_CONDITIONAL(SFLOW, test "$build_sflow" = yes)

AC_ARG_ENABLE(readpcap,
[ --enable-readpcap Build nfcapd collector to read from pcap file instead of network data; default is NO])
Expand Down Expand Up @@ -627,15 +627,15 @@ if test "x$enable_ftconv" = "xyes"; then
AC_CONFIG_FILES([src/ft2nfdump/Makefile])
fi

if test "x$enable_sflow" = "xyes"; then
if test "x$build_sflow" = "xyes"; then
AC_CONFIG_FILES([src/sflow/Makefile])
fi

if test "x$enable_nfpcapd" = "xyes"; then
if test "x$build_nfpcapd" = "xyes"; then
AC_CONFIG_FILES([src/nfpcapd/Makefile])
fi

if test "x$enable_nfprofile" = "xyes"; then
if test "x$build_nfprofile" = "xyes"; then
AC_CONFIG_FILES([src/nfsen/Makefile])
fi

Expand All @@ -655,7 +655,7 @@ echo " LIBS = $LIBS"
echo " Enable liblz4 = $use_lz4"
echo " Enable libbz2 = $use_bzip2"
echo " Enable libzstd = $use_zstd"
echo " Build geolookup = $use_maxmind"
echo " Build geolookup = $build_maxmind"
echo " Build sflow = $build_sflow"
echo " Build nfpcapd = $build_nfpcapd"
echo " Build flowtools conv = $build_ftconv"
Expand Down

0 comments on commit 622670b

Please sign in to comment.