فهرست منبع

build: disable wireshark disector by default

follow the standard for all corosync extra features.
enable only on demand

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Fabio M. Di Nitto 2 هفته پیش
والد
کامیت
132d21fd6c
1فایلهای تغییر یافته به همراه20 افزوده شده و 19 حذف شده
  1. 20 19
      configure.ac

+ 20 - 19
configure.ac

@@ -49,11 +49,6 @@ AM_CONDITIONAL([BUILD_RUST_BINDINGS], [test x$enable_rust_bindings = xyes])
 corosyncrustver=["`echo ${VERSION} | sed 's/\.\([^-\.]*-\)/-\1/'`"]
 corosyncrustver=["`echo ${VERSION} | sed 's/\.\([^-\.]*-\)/-\1/'`"]
 AC_SUBST([corosyncrustver])
 AC_SUBST([corosyncrustver])
 
 
-AC_ARG_ENABLE([wireshark-dissector],
-	[AS_HELP_STRING([--enable-wireshark-dissector],[libknet wireshark dissector support])],,
-	[ enable_wireshark_dissector="yes" ])
-AM_CONDITIONAL([BUILD_WSDISSECTOR], [test x$enable_wireshark_dissector = xyes])
-
 dnl Fix default variables - "prefix" variable if not specified
 dnl Fix default variables - "prefix" variable if not specified
 systemddir=${prefix}/lib/systemd/system
 systemddir=${prefix}/lib/systemd/system
 
 
@@ -196,20 +191,6 @@ AC_CHECK_LIB([knet],[knet_handle_setprio_dscp],
 	     [AC_DEFINE_UNQUOTED([HAVE_KNET_SETPRIO_DSCP], 1, [have knet dscp traffic prioritization])])
 	     [AC_DEFINE_UNQUOTED([HAVE_KNET_SETPRIO_DSCP], 1, [have knet dscp traffic prioritization])])
 LIBS="$OLDLIBS"
 LIBS="$OLDLIBS"
 
 
-wireshark_INSTALL_PREFIX=""
-# checks for libknet wireshark dissector
-if test "x$enable_wireshark_dissector" = xyes; then
-	PKG_CHECK_MODULES([wireshark], [wireshark >= 4.6.0])
-	PKG_CHECK_VAR([wireshark_PLUGINDIR], [wireshark], [plugindir])
-	PKG_CHECK_VAR([wireshark_PREFIX], [wireshark], [prefix])
-	# workaround to make make distcheck happy
-	if test "x$wireshark_PREFIX" != "x${prefix}"; then
-		wireshark_INSTALL_PREFIX="${prefix}"
-	fi
-	WITH_LIST="$WITH_LIST --with wsdissector"
-fi
-AC_SUBST([wireshark_INSTALL_PREFIX], [$wireshark_INSTALL_PREFIX])
-
 # Checks for library functions.
 # Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_ALLOCA
 AC_FUNC_CLOSEDIR_VOID
 AC_FUNC_CLOSEDIR_VOID
@@ -464,6 +445,11 @@ AC_ARG_ENABLE([nozzle],
 	[  --enable-nozzle                 : Support for nozzle ],,
 	[  --enable-nozzle                 : Support for nozzle ],,
 	[ enable_nozzle="no" ])
 	[ enable_nozzle="no" ])
 
 
+AC_ARG_ENABLE([wireshark-dissector],
+	[AS_HELP_STRING([--enable-wireshark-dissector],[libknet wireshark dissector support])],,
+	[ enable_wireshark_dissector="no" ])
+AM_CONDITIONAL([BUILD_WSDISSECTOR], [test x$enable_wireshark_dissector = xyes])
+
 # *FLAGS handling goes here
 # *FLAGS handling goes here
 
 
 ENV_CFLAGS="$CFLAGS"
 ENV_CFLAGS="$CFLAGS"
@@ -624,6 +610,21 @@ if test "x${enable_snmp}" = xyes; then
 fi
 fi
 AM_CONDITIONAL(BUILD_SNMP, test "${do_snmp}" = "1")
 AM_CONDITIONAL(BUILD_SNMP, test "${do_snmp}" = "1")
 
 
+wireshark_INSTALL_PREFIX=""
+# checks for libknet wireshark dissector
+if test "x$enable_wireshark_dissector" = xyes; then
+	PKG_CHECK_MODULES([wireshark], [wireshark >= 4.6.0])
+	PKG_CHECK_VAR([wireshark_PLUGINDIR], [wireshark], [plugindir])
+	PKG_CHECK_VAR([wireshark_PREFIX], [wireshark], [prefix])
+	# workaround to make make distcheck happy
+	if test "x$wireshark_PREFIX" != "x${prefix}"; then
+		wireshark_INSTALL_PREFIX="${prefix}"
+	fi
+	PACKAGE_FEATURES="$PACKAGE_FEATURES wireshark-dissector"
+	WITH_LIST="$WITH_LIST --with wsdissector"
+fi
+AC_SUBST([wireshark_INSTALL_PREFIX], [$wireshark_INSTALL_PREFIX])
+
 # extra warnings
 # extra warnings
 EXTRA_WARNINGS=""
 EXTRA_WARNINGS=""