From 45803c762873cb39fb36858d743b58097833c236 Mon Sep 17 00:00:00 2001 From: Alexander Ryzhov Date: Tue, 16 Feb 2016 09:03:58 -0500 Subject: [PATCH] snort: remove useless mysql/pgsql options Signed-off-by: Alexander Ryzhov --- net/snort/Config.in | 14 -------------- net/snort/Makefile | 14 +------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/net/snort/Config.in b/net/snort/Config.in index 433557c30..a79e51db0 100644 --- a/net/snort/Config.in +++ b/net/snort/Config.in @@ -1,20 +1,6 @@ menu "Configuration" depends on PACKAGE_snort -config SNORT_MYSQL - bool "Enable MySQL support" - default n - help - This option enables support for logging to a MySQL database. - Disabled by default. - -config SNORT_PGSQL - bool "Enable PostgreSQL support" - default n - help - This option enables support for logging to a PostgreSQL database. - Disabled by default. - config SNORT_LZMA bool "Enable LZMA support" default n diff --git a/net/snort/Makefile b/net/snort/Makefile index 9886a5d92..761eb1780 100644 --- a/net/snort/Makefile +++ b/net/snort/Makefile @@ -30,7 +30,7 @@ define Package/snort SUBMENU:=Firewall SECTION:=net CATEGORY:=Network - DEPENDS:=+libdaq +libdnet +libopenssl +libpcap +libpcre +libpthread +libuuid +zlib +SNORT_MYSQL:libmysqlclient +SNORT_PGSQL:libpq +SNORT_PGSQL:libuuid +SNORT_LZMA:liblzma + DEPENDS:=+libdaq +libdnet +libopenssl +libpcap +libpcre +libpthread +libuuid +zlib +SNORT_LZMA:liblzma TITLE:=Lightweight Network Intrusion Detection System URL:=http://www.snort.org/ MENU:=1 @@ -61,24 +61,12 @@ CONFIGURE_ARGS += \ --with-daq-libraries="$(STAGING_DIR)/usr/lib" \ --disable-static-daq -ifeq ($(CONFIG_SNORT_MYSQL),) -CONFIGURE_ARGS += \ - --without-mysql -endif - -ifeq ($(CONFIG_PGSQL),) -CONFIGURE_ARGS += \ - --without-postgresql -endif - ifeq ($(CONFIG_SNORT_LZMA),) CONFIGURE_ARGS += \ --disable-lzma endif CONFIGURE_VARS += \ - CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/mysql" \ - LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/mysql" \ PATH="$(STAGING_DIR)/usr/lib/libnet-1.0.x/bin:$$$$PATH" MAKE_FLAGS += \