bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] collectd: fix handling of plugins with '_' in their name, add explicit mysql detection

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@22140 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2010-07-11 20:13:45 +00:00
parent b40494df31
commit a213128191
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/collectd/Makefile
View File

@ -112,7 +112,7 @@ COLLECTD_PLUGINS_SELECTED:= \
write_http \
PKG_CONFIG_DEPENDS:= \
$(patsubst %,CONFIG_PACKAGE_collectd-mod-%,$(COLLECTD_PLUGINS_SELECTED)) \
$(patsubst %,CONFIG_PACKAGE_collectd-mod-%,$(subst _,-,$(COLLECTD_PLUGINS_SELECTED))) \
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/kernel.mk
@ -150,7 +150,7 @@ CONFIGURE_VARS+= \
CONFIGURE_PLUGIN= \
$(foreach m, $(1), \
$(if $(CONFIG_PACKAGE_collectd-mod-$(m)),--enable-$(m),--disable-$(m)) \
$(if $(CONFIG_PACKAGE_collectd-mod-$(subst _,-,$(m))),--enable-$(m),--disable-$(m)) \
)
CONFIGURE_ARGS+= \
@ -163,6 +163,10 @@ ifneq ($(CONFIG_PACKAGE_collectd-mod-ascent),)
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/libxml2"
endif
ifneq ($(CONFIG_PACKAGE_collectd-mod-mysql),)
CONFIGURE_ARGS+= --with-libmysql="$(STAGING_DIR)/usr/"
endif
# exception: mod-netlink needs libnetlink from iproute
ifneq ($(CONFIG_PACKAGE_collectd-mod-netlink),)
CONFIGURE_ARGS+= --with-libnetlink="$(STAGING_DIR)/usr"