configure: Remove enable-rust-debug

Get rid of enable-rust-debug flag and use enable-debug for acheiving the
desired functionality. From now, adding `--enable-debug` to `configure`
shall create an [unoptimitized + debuginfo] target. Rest behavior stays
the same.

Closes redmine ticket #3054

diff --git a/configure.ac b/configure.ac
index ad14f66dfe792cdb7f9cd1ed2f8175632bf76a0e..ef153e23e1f2109448f34c40956c50a29a90caed 100644 (file)
--- 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 df3bd0bcd330ef74c4350dbdc8a8fb7c5cce7ab7..05a9655182d91a1056a9f6cd1735af0b4574a7f7 100644 (file)
--- 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