From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 16 Feb 2012 17:41:10 +0000 (+0100)
Subject: Use filter instead of findstring to check for enabled plugins in Android.mk.
X-Git-Tag: 5.0.1~211^2~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80b267f9e3baccdf636e8302efd5cf277147d97e;p=thirdparty%2Fstrongswan.git

Use filter instead of findstring to check for enabled plugins in Android.mk.

findstring is not prefix-safe (i.e. android matches android-log). On
the other hand filter matches words separated by whitespace and if no
wildcard (%) is used the full word has to match.
---

diff --git a/Android.mk.in b/Android.mk.in
index 19048b9e7f..2b51d3ea18 100644
--- a/Android.mk.in
+++ b/Android.mk.in
@@ -34,7 +34,7 @@ strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS) \
 
 # helper macros to only add source files for plugins included in the list above
 # source files are relative to the android.mk that called the macro
-plugin_enabled = $(findstring $(1), $(strongswan_PLUGINS))
+plugin_enabled = $(filter $(1), $(strongswan_PLUGINS))
 add_plugin = $(if $(call plugin_enabled,$(1)), \
                $(patsubst $(LOCAL_PATH)/%,%, \
                  $(wildcard \