Changeset 22140


Ignore:
Timestamp:
2010-07-11T22:13:45+02:00 (8 years ago)
Author:
nico
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/utils/collectd/Makefile

    r22133 r22140  
    113113 
    114114PKG_CONFIG_DEPENDS:= \ 
    115         $(patsubst %,CONFIG_PACKAGE_collectd-mod-%,$(COLLECTD_PLUGINS_SELECTED)) \ 
     115        $(patsubst %,CONFIG_PACKAGE_collectd-mod-%,$(subst _,-,$(COLLECTD_PLUGINS_SELECTED))) \ 
    116116 
    117117include $(INCLUDE_DIR)/package.mk 
     
    151151CONFIGURE_PLUGIN= \ 
    152152        $(foreach m, $(1), \ 
    153                 $(if $(CONFIG_PACKAGE_collectd-mod-$(m)),--enable-$(m),--disable-$(m)) \ 
     153                $(if $(CONFIG_PACKAGE_collectd-mod-$(subst _,-,$(m))),--enable-$(m),--disable-$(m)) \ 
    154154        ) 
    155155 
     
    162162  CONFIGURE_VARS+= \ 
    163163        CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/libxml2" 
     164endif 
     165 
     166ifneq ($(CONFIG_PACKAGE_collectd-mod-mysql),) 
     167  CONFIGURE_ARGS+= --with-libmysql="$(STAGING_DIR)/usr/" 
    164168endif 
    165169 
Note: See TracChangeset for help on using the changeset viewer.