]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
rust: remove build system HAVE_RUST guards
authorVictor Julien <victor@inliniac.net>
Fri, 11 Oct 2019 09:21:41 +0000 (11:21 +0200)
committerVictor Julien <victor@inliniac.net>
Fri, 11 Oct 2019 12:56:22 +0000 (14:56 +0200)
rust/Makefile.am
src/Makefile.am

index 8ede2c81ab1ba5b72a4760e9f4e8ad66b7c76bda..70930e15427c249d330ba52802d5896986c2fffb 100644 (file)
@@ -1,12 +1,8 @@
-EXTRA_DIST =   Cargo.toml \
+EXTRA_DIST = Cargo.toml Cargo.lock \
                src \
                .cargo/config.in \
                gen-c-headers.py
 
-if HAVE_RUST
-
-EXTRA_DIST +=  Cargo.lock
-
 if HAVE_CARGO_VENDOR
 EXTRA_DIST +=  vendor
 endif
@@ -75,8 +71,3 @@ gen/c-headers:
 else
 gen/c-headers:
 endif
-else # HAVE_RUST
-
-all-local clean-local check vendor gen/c-headers:
-
-endif # HAVE_RUST
index f353d4cee026c3ab707a49adb2fc357d47dc627a..5df1700a538f2e773c854306202c33d11f38561c 100755 (executable)
@@ -542,10 +542,7 @@ AM_CPPFLAGS = $(all_includes)
 # the library search path.
 suricata_LDFLAGS = $(all_libraries) ${SECLDFLAGS}
 suricata_LDADD = $(HTP_LDADD) $(RUST_LDADD)
-
-if HAVE_RUST
 suricata_DEPENDENCIES = $(RUST_SURICATA_LIB)
-endif
 
 # default CFLAGS
 AM_CFLAGS = ${OPTIMIZATION_CFLAGS} ${GCC_CFLAGS} ${CLANG_CFLAGS}            \