Add conditionnal support of bindings version 2

[src/app-framework-binder.git] / src / afb-args.c

diff --git a/src/afb-args.c b/src/afb-args.c
index 05a8865..1dc2e6c 100644 (file)
--- a/src/afb-args.c
+++ b/src/afb-args.c
@@ -109,7 +109,7 @@
 #endif
 #define SET_TRAP_FAULTS     27
 #define ADD_CALL            28
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 #   define ADD_DBUS_CLIENT  30
 #   define ADD_DBUS_SERVICE 31
 #endif
@@ -185,7 +185,7 @@ static struct option_desc optdefs[] = {
        {GET_VERSION,         0, "version",     "Display version and copyright"},
        {GET_HELP,            0, "help",        "Display this help"},
 
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
        {ADD_DBUS_CLIENT,     1, "dbus-client", "Bind to an afb service through dbus"},
        {ADD_DBUS_SERVICE,    1, "dbus-server", "Provide an afb service through dbus"},
 #endif
@@ -335,7 +335,7 @@ static void printVersion(FILE * file)
                "\n"
                "  AGL Framework Binder [AFB %s] "
 
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
                "+"
 #else
                "-"
@@ -348,7 +348,7 @@ static void printVersion(FILE * file)
                "-"
 #endif
                "MONITOR "
-#if defined(WITH_SUPERVISION)
+#if WITH_SUPERVISION
                "+"
 #else
                "-"
@@ -370,18 +370,24 @@ static void printVersion(FILE * file)
                "TRACE "
 
                "[BINDINGS "
-#if defined(WITH_LEGACY_BINDING_V1)
+#if WITH_LEGACY_BINDING_V1
                "+"
 #else
                "-"
 #endif
                "V1 "
-#if defined(WITH_LEGACY_BINDING_VDYN)
+#if WITH_LEGACY_BINDING_VDYN
                "+"
 #else
                "-"
 #endif
-               "VDYN +V2 +V3]\n"
+               "VDYN "
+#if WITH_LEGACY_BINDING_V2
+               "+"
+#else
+               "-"
+#endif
+               "V2 +V3]\n"
                "\n",
                AFB_VERSION
        );
@@ -545,6 +551,7 @@ static int config_has_bool(struct json_object *config, int optid)
                && json_object_get_boolean(x);
 }
 
+__attribute__((unused))
 static int config_has_str(struct json_object *config, int optid, const char *val)
 {
        int i, n;
@@ -814,7 +821,7 @@ static void parse_arguments_inner(int argc, char **argv, struct json_object *con
                        config_set_optstr(config, optid);
                        break;
 
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
                case ADD_DBUS_CLIENT:
                case ADD_DBUS_SERVICE:
 #endif