X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=4b574879d92842d0eebeeaff324c349d00bbd3dd;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=872819771fd78d987ca562a8fbb803e900bed1be;hpb=4f7f5ae8e1907b23cb74178dea68790a6fa963fe;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index 87281977..4b574879 100644
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017, 2018 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#if WITH_DYNAMIC_BINDING
+
 #define _GNU_SOURCE
 
 #include <stdio.h>
@@ -25,17 +27,19 @@
 #include <sys/stat.h>
 
 #include "afb-api-so.h"
-#include "afb-api-so-v2.h"
 #include "afb-api-so-v3.h"
 #include "verbose.h"
 #include "sig-monitor.h"
 
-#if defined(WITH_LEGACY_BINDING_V1)
+#if WITH_LEGACY_BINDING_V1
 #   include "afb-api-so-v1.h"
 #endif
-#if defined(WITH_LEGACY_BINDING_VDYN)
+#if WITH_LEGACY_BINDING_VDYN
 #   include "afb-api-so-vdyn.h"
 #endif
+#if WITH_LEGACY_BINDING_V2
+#   include "afb-api-so-v2.h"
+#endif
 
 struct safe_dlopen
 {
@@ -91,6 +95,7 @@ static int load_binding(const char *path, int force, struct afb_apiset *declare_
 	if (rc)
 		return 0; /* yes version 3 */
 
+#if WITH_LEGACY_BINDING_V2
 	/* try the version 2 */
 	rc = afb_api_so_v2_add(path, handle, declare_set, call_set);
 	if (rc < 0) {
@@ -99,8 +104,14 @@ static int load_binding(const char *path, int force, struct afb_apiset *declare_
 	}
 	if (rc)
 		return 0; /* yes version 2 */
+#else
+	if (dlsym(handle, "afbBindingV2")) {
+		WARNING("binding [%s]: version 2 not supported", path);
+		obsolete = 1;
+	}
+#endif
 
-#if defined(WITH_LEGACY_BINDING_VDYN)
+#if WITH_LEGACY_BINDING_VDYN
 	/* try the version dyn */
 	rc = afb_api_so_vdyn_add(path, handle, declare_set, call_set);
 	if (rc < 0) {
@@ -116,7 +127,7 @@ static int load_binding(const char *path, int force, struct afb_apiset *declare_
 	}
 #endif
 
-#if defined(WITH_LEGACY_BINDING_V1)
+#if WITH_LEGACY_BINDING_V1
 	/* try the version 1 */
 	rc = afb_api_so_v1_add(path, handle, declare_set, call_set);
 	if (rc < 0) {
@@ -313,3 +324,4 @@ int afb_api_so_add_pathset_nofails(const char *pathset, struct afb_apiset *decla
 	return afb_api_so_add_pathset(pathset, declare_set, call_set, 0);
 }
 
+#endif