diff --git a/configure.ac b/configure.ac index ad14f66dfe..ef153e23e1 100644 --- a/configure.ac +++ b/configure.ac @@ -2395,12 +2395,12 @@ fi echo exit 1 fi - if test "x$enable_debug" = "xyes"; then RUST_SURICATA_LIB="../rust/target/debug/${RUST_SURICATA_LIBNAME}" else RUST_SURICATA_LIB="../rust/target/release/${RUST_SURICATA_LIBNAME}" fi + RUST_LDADD="${RUST_SURICATA_LIB} ${RUST_LDADD}" CFLAGS="${CFLAGS} -I\${srcdir}/../rust/gen/c-headers" AC_SUBST(RUST_SURICATA_LIB) @@ -2438,11 +2438,6 @@ fi ]) AC_SUBST(RUST_FEATURES) - AC_ARG_ENABLE(rust_debug, - AS_HELP_STRING([--enable-rust-debug], [Rust not in --release mode]),[enable_rust_debug=$enableval],[enable_rust_debug=no]) - AM_CONDITIONAL([RUST_DEBUG], [test "x$enable_rust_debug" = "xyes"]) - AC_SUBST(RUST_DEBUG) - # get revision if test -f ./revision; then REVISION=`cat ./revision` @@ -2604,7 +2599,6 @@ SURICATA_BUILD_CONF="Suricata Configuration: Rust support: ${enable_rust} Rust strict mode: ${enable_rust_strict} - Rust debug mode: ${enable_rust_debug} Rust compiler: ${rust_compiler_version} Rust cargo: ${rust_cargo_version} diff --git a/rust/Makefile.am b/rust/Makefile.am index df3bd0bcd3..05a9655182 100644 --- a/rust/Makefile.am +++ b/rust/Makefile.am @@ -15,11 +15,9 @@ if HAVE_RUST_VENDOR FROZEN = --frozen endif -if !RUST_DEBUG if !DEBUG RELEASE = --release endif -endif if HAVE_LUA RUST_FEATURES += lua