Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

diff --git a/lfs/snort b/lfs/snort
index 77d3b0d613b42b63e3393889ac2444e5c589112d..373e53cd810bd7f59c54a075e61abe6c8a677eb3 100644 (file)
--- a/lfs/snort
+++ b/lfs/snort
@@ -72,18 +72,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) $(DIR_SRC)/snort* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
-               --disable-nls \
                --sysconfdir=/etc/snort \
                --target=i586 \
                --enable-linux-smp-stats \
-               --enable-smb-alerts \
                --enable-gre --enable-mpls \
                --enable-targetbased \
-               --enable-decoder-preprocessor-rules \
                --enable-ppm \
                --enable-non-ether-decoders \
                --enable-perfprofiling \
-               --enable-zlib \
                --enable-active-response \
                --enable-normalizer \
                --enable-reload \