From: Shane Bryldt <astaelan@gmail.com>
Date: Tue, 10 Oct 2017 12:32:59 +0000 (-0600)
Subject: FS-10690: [libblade] fixed up libconfig to treat 1.4.x as legacy for debian 8 system... 
X-Git-Tag: v1.8.0~230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1730238273e66f2a2dd3024b3eb1084b723fa3c;p=thirdparty%2Ffreeswitch.git

FS-10690: [libblade] fixed up libconfig to treat 1.4.x as legacy for debian 8 system packages, with 1.5.0 expected on windows and newer linux
---

diff --git a/libs/libblade/src/blade_mastermgr.c b/libs/libblade/src/blade_mastermgr.c
index 7264c00558..e719446b99 100644
--- a/libs/libblade/src/blade_mastermgr.c
+++ b/libs/libblade/src/blade_mastermgr.c
@@ -126,7 +126,7 @@ ks_status_t blade_mastermgr_config(blade_mastermgr_t *bmmgr, config_setting_t *c
 
 	master = config_setting_get_member(config, "master");
 	if (master) {
-		master_nodeid = config_lookup_from(master, "nodeid");
+		master_nodeid = config_setting_lookup(master, "nodeid");
 		if (!master_nodeid) return KS_STATUS_FAIL;
 
 		if (config_setting_type(master_nodeid) != CONFIG_TYPE_STRING) return KS_STATUS_FAIL;
diff --git a/libs/libblade/src/blade_restmgr.c b/libs/libblade/src/blade_restmgr.c
index 69d4551017..34964f43bc 100644
--- a/libs/libblade/src/blade_restmgr.c
+++ b/libs/libblade/src/blade_restmgr.c
@@ -165,7 +165,7 @@ KS_DECLARE(ks_status_t) blade_restmgr_destroy(blade_restmgr_t **brestmgrP)
 }
 
 #define CONFIG_LOADSTR(k) \
-tmp = config_lookup_from(rest, k); \
+tmp = config_setting_lookup(rest, k); \
 if (tmp && config_setting_type(tmp) != CONFIG_TYPE_STRING) return KS_STATUS_FAIL; \
 if (tmp) ks_hash_insert(brestmgr->config.options, (void *)k, (void *)ks_pstrdup(pool, config_setting_get_string(tmp)));
 
@@ -186,7 +186,7 @@ ks_status_t blade_restmgr_config(blade_restmgr_t *brestmgr, config_setting_t *co
 
 	rest = config_setting_get_member(config, "rest");
 	if (rest) {
-		tmp = config_lookup_from(rest, "enabled");
+		tmp = config_setting_lookup(rest, "enabled");
 		if (!tmp) return KS_STATUS_FAIL;
 
 		if (config_setting_type(tmp) != CONFIG_TYPE_BOOL) return KS_STATUS_FAIL;
diff --git a/libs/libblade/src/include/blade.h b/libs/libblade/src/include/blade.h
index 97025a21c4..f34208c45d 100644
--- a/libs/libblade/src/include/blade.h
+++ b/libs/libblade/src/include/blade.h
@@ -65,9 +65,9 @@
 
 KS_BEGIN_EXTERN_C
 
-#ifdef _WIN32
-// @todo look into why the tarball build has a different function name from the debian package
-#define config_lookup_from config_setting_lookup
+// legacy for libconfig pre 1.5.0
+#if (LIBCONFIG_VER_MAJOR <= 1) && (LIBCONFIG_VER_MINOR <= 4)
+#define config_setting_lookup config_lookup_from
 #endif
 
 #ifdef __APPLE__