use model-config for checking geofence enabled instead of build-feature

Signed-off-by: jomui <jongmun.woo@samsung.com>
Change-Id: I672674310691ca607fd2212756fb57b92a4e5583

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 225f7f76b62b8cd32145c36fd1584c22a0b4401b..21e40045b70af448953578db087a40ba1f63d54e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,12 +16,9 @@ SET(INC_DIR
     )
 INCLUDE_DIRECTORIES(${INC_DIR})
 
-SET(dependents "dlog vconf glib-2.0 gmodule-2.0 capi-appfw-app-manager capi-appfw-package-manager pkgmgr-info privacy-manager-client")
+SET(dependents "dlog vconf glib-2.0 gmodule-2.0 capi-appfw-app-manager capi-appfw-package-manager pkgmgr-info privacy-manager-client capi-system-info")
 SET(pc_dependents "capi-base-common")
 
-IF(ENABLE_GEOFENCE)
-       ADD_DEFINITIONS(-DENABLE_GEOFENCE)
-ENDIF(ENABLE_GEOFENCE)
 ADD_DEFINITIONS("-DMODULE_PATH_PREFIX=\"${MODULE_PATH}\"")
 
 INCLUDE(FindPkgConfig)

diff --git a/doc/geofence-manager-doc.h b/doc/geofence-manager-doc.h
index eb63d04e934e03ee34d9ed577532ccfe59ba4451..c62560ee84cb3104dc2f707805a2251d86e80a76 100644 (file)
--- a/doc/geofence-manager-doc.h
+++ b/doc/geofence-manager-doc.h
@@ -51,7 +51,8 @@
  *
  * @section CAPI_GEOFENCE_MANAGER_MODULE_FEATURE Related Features
  * This API is related with the following features:\n
- *     - http://tizen.org/feature/location\n
+ *  - http://tizen.org/feature/location\n
+ *  - http://tizen.org/feature/location.geofence\n
  *
  * It is recommended to design feature related codes in your application for reliability.\n
  *
@@ -90,6 +91,7 @@
  * @section CAPI_GEOFENCE_MODULE_FEATURE Related Features
  * This API is related with the following features:\n
  *  - http://tizen.org/feature/location\n
+ *  - http://tizen.org/feature/location.geofence\n
  *
  * It is recommended to design feature related codes in your application for reliability.\n
  *

diff --git a/packaging/capi-geofence-manager.spec b/packaging/capi-geofence-manager.spec
index b57c91c226785a6be8012924c0c9ef8541f19d84..d6568bbb73aa9fc7300df5028a975cc0458ba1e4 100644 (file)
--- a/packaging/capi-geofence-manager.spec
+++ b/packaging/capi-geofence-manager.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/api/geofence-manager capi-geofence-manager 0.1.0 d1ee09a32e8bc0e9ed48ece37c641a7393c086c5
 Name:       capi-geofence-manager
 Summary:    A Geofence Manager library in Tizen Native API
-Version:    0.3.0
+Version:    0.3.1
 Release:    1
 Group:      Location/Libraries
 License:    Apache-2.0
@@ -12,7 +12,6 @@ ExcludeArch: %{arm} %ix86 x86_64
 %endif
 
 BuildRequires:  cmake
-#BuildRequires:  model-build-features
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(vconf)
@@ -22,6 +21,7 @@ BuildRequires:  pkgconfig(capi-appfw-app-manager)
 BuildRequires:  pkgconfig(capi-appfw-package-manager)
 BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(privacy-manager-client)
+BuildRequires:  pkgconfig(capi-system-info)
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -39,7 +39,7 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DENABLE_GEOFENCE=YES\
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} \
 
 make %{?jobs:-j%jobs}
 

diff --git a/src/geofence_manager.c b/src/geofence_manager.c
index 02ece27464ea11f8ad46d123979c7f921fb2b3c3..4a984106005da68a133a51d7f46f90252e210109 100644 (file)
--- a/src/geofence_manager.c
+++ b/src/geofence_manager.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
+#include <system_info.h>
 
 #include "geofence-log.h"
 #include "geofence.h"
@@ -33,6 +34,16 @@ static GList *tracking_list = NULL;
 static geofence_manager_s *handle = NULL;
 static int gIsMgrCreated = 0;
 
+bool __is_geofence_feature_enabled()
+{
+       const char *geofence_feature = "http://tizen.org/feature/location.geofence";
+       bool geofence_enabled = false;
+
+       system_info_get_platform_bool(geofence_feature, &geofence_enabled);
+
+       return geofence_enabled;
+}
+
 static void __cb_zone_in(GObject *self, guint geofence_id, gpointer userdata)
 {
        GEOFENCE_LOGD("__cb_zone_in : geofence_id = %d", geofence_id);
@@ -206,9 +217,10 @@ static bool __is_fence_started(int fence_id)
 EXPORT_API int geofence_manager_is_supported(bool *supported)
 {
        GEOFENCE_LOGD("geofence_manager_is_supported");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+               return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(supported);
 
        *supported = geofence_is_supported();
@@ -219,9 +231,10 @@ EXPORT_API int geofence_manager_is_supported(bool *supported)
 EXPORT_API int geofence_manager_create(geofence_manager_h *manager)
 {
        GEOFENCE_LOGD("geofence_manager_create");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+               return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
 
        int ret = GEOFENCE_MANAGER_ERROR_NONE;
@@ -277,9 +290,10 @@ EXPORT_API int geofence_manager_create(geofence_manager_h *manager)
 EXPORT_API int geofence_manager_destroy(geofence_manager_h manager)
 {
        GEOFENCE_LOGD("geofence_manager_destroy");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+               return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        geofence_manager_s *handle = (geofence_manager_s *) manager;
        int ret = GEOFENCE_MANAGER_ERROR_NONE;
@@ -333,9 +347,10 @@ EXPORT_API int geofence_manager_destroy(geofence_manager_h manager)
 /*EXPORT_API int geofence_manager_enable_fence(geofence_manager_h manager, int geofence_id, bool enable)
 {
        GEOFENCE_LOGD("geofence_manager_enable_service");
-#ifndef ENABLE_GEOFENCE
-    return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+               return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        GEOFENCE_CHECK_CONDITION(geofence_id > 0, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER, "GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER");
        geofence_manager_s *handle = (geofence_manager_s *) manager;
@@ -357,9 +372,10 @@ EXPORT_API int geofence_manager_destroy(geofence_manager_h manager)
 EXPORT_API int geofence_manager_start(geofence_manager_h manager, int geofence_id)
 {
        GEOFENCE_LOGD("geofence_manager_start : Geofence ID[%d]", geofence_id);
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+               return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        GEOFENCE_CHECK_CONDITION(geofence_id > 0, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER, "GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER");
 
@@ -385,9 +401,10 @@ EXPORT_API int geofence_manager_start(geofence_manager_h manager, int geofence_i
 EXPORT_API int geofence_manager_stop(geofence_manager_h manager, int geofence_id)
 {
        GEOFENCE_LOGD("geofence_manager_stop");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+               return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        GEOFENCE_CHECK_CONDITION(geofence_id > 0, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER, "GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER");
 
@@ -415,9 +432,10 @@ EXPORT_API int geofence_manager_stop(geofence_manager_h manager, int geofence_id
 EXPORT_API int geofence_manager_add_fence(geofence_manager_h manager, geofence_h params, int *geofence_id)
 {
        GEOFENCE_LOGD("ENTER >>>");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+               return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        GEOFENCE_NULL_ARG_CHECK(params);
        GEOFENCE_NULL_ARG_CHECK(geofence_id);
@@ -441,9 +459,10 @@ EXPORT_API int geofence_manager_add_fence(geofence_manager_h manager, geofence_h
 EXPORT_API int geofence_manager_add_place(geofence_manager_h manager, const char *place_name, int *place_id)
 {
        GEOFENCE_LOGD("ENTER >>>");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+               return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        GEOFENCE_NULL_ARG_CHECK(place_id);
        GEOFENCE_NULL_ARG_CHECK(place_name);
@@ -466,9 +485,9 @@ EXPORT_API int geofence_manager_add_place(geofence_manager_h manager, const char
 
 EXPORT_API int geofence_manager_update_place(geofence_manager_h manager, int place_id, const char *place_name)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+               return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        GEOFENCE_NULL_ARG_CHECK(place_name);
        GEOFENCE_CHECK_CONDITION(place_id > 0, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER, "GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER");
@@ -494,9 +513,10 @@ EXPORT_API int geofence_manager_update_place(geofence_manager_h manager, int pla
 EXPORT_API int geofence_manager_remove_fence(geofence_manager_h manager, int geofence_id)
 {
        GEOFENCE_LOGD("geofence_manager_remove_geofence");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        GEOFENCE_CHECK_CONDITION(geofence_id > 0, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER, "GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER");
 
@@ -518,9 +538,10 @@ EXPORT_API int geofence_manager_remove_fence(geofence_manager_h manager, int geo
 EXPORT_API int geofence_manager_remove_place(geofence_manager_h manager, int place_id)
 {
        GEOFENCE_LOGD("geofence_manager_remove_place");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        GEOFENCE_CHECK_CONDITION(place_id > 0, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER, "GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER");
 
@@ -543,9 +564,10 @@ EXPORT_API int geofence_manager_remove_place(geofence_manager_h manager, int pla
 EXPORT_API int geofence_manager_get_place_name(geofence_manager_h manager, int place_id, char **place_name)
 {
        GEOFENCE_LOGD("geofence_manager_remove_place");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        GEOFENCE_NULL_ARG_CHECK(place_name);
        GEOFENCE_CHECK_CONDITION(place_id > 0, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER, "GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER");
@@ -569,9 +591,10 @@ EXPORT_API int geofence_manager_get_place_name(geofence_manager_h manager, int p
 EXPORT_API int geofence_manager_set_geofence_state_changed_cb(geofence_manager_h manager, geofence_state_changed_cb callback, void *user_data)
 {
        GEOFENCE_LOGD("geofence_manager_set_geofence_state_changed_cb");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
 
        return __set_callback(manager, callback, user_data);
@@ -580,9 +603,10 @@ EXPORT_API int geofence_manager_set_geofence_state_changed_cb(geofence_manager_h
 EXPORT_API int geofence_manager_set_geofence_event_cb(geofence_manager_h manager, geofence_event_cb callback, void *user_data)
 {
        GEOFENCE_LOGD("geofence_manager_set_geofence_event_cb");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
 
        return __set_event_callback(manager, callback, user_data);
@@ -591,9 +615,10 @@ EXPORT_API int geofence_manager_set_geofence_event_cb(geofence_manager_h manager
 EXPORT_API int geofence_manager_unset_geofence_state_changed_cb(geofence_manager_h manager)
 {
        GEOFENCE_LOGD("geofence_manager_unset_geofence_state_changed_cb");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
 
        return __unset_callback(manager);
@@ -602,9 +627,10 @@ EXPORT_API int geofence_manager_unset_geofence_state_changed_cb(geofence_manager
 EXPORT_API int geofence_manager_unset_geofence_event_cb(geofence_manager_h manager)
 {
        GEOFENCE_LOGD("geofence_manager_unset_geofence_event_cb");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
 
        return __unset_event_callback(manager);
@@ -613,9 +639,10 @@ EXPORT_API int geofence_manager_unset_geofence_event_cb(geofence_manager_h manag
 EXPORT_API int geofence_manager_foreach_geofence_list(geofence_manager_h manager, geofence_manager_fence_cb callback, void *user_data)
 {
        GEOFENCE_LOGD(">>> Start");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        GEOFENCE_NULL_ARG_CHECK(callback);
 
@@ -665,9 +692,10 @@ EXPORT_API int geofence_manager_foreach_geofence_list(geofence_manager_h manager
 EXPORT_API int geofence_manager_foreach_place_geofence_list(geofence_manager_h manager, int place_id, geofence_manager_fence_cb callback, void *user_data)
 {
        GEOFENCE_LOGD(">>> Start");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        GEOFENCE_NULL_ARG_CHECK(callback);
        GEOFENCE_CHECK_CONDITION(place_id > 0, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER, "GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER");
@@ -714,9 +742,10 @@ EXPORT_API int geofence_manager_foreach_place_geofence_list(geofence_manager_h m
 EXPORT_API int geofence_manager_foreach_place_list(geofence_manager_h manager, geofence_manager_place_cb callback, void *user_data)
 {
        GEOFENCE_LOGD(">>> Start");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(manager);
        GEOFENCE_NULL_ARG_CHECK(callback);
 
@@ -761,9 +790,10 @@ EXPORT_API int geofence_manager_foreach_place_list(geofence_manager_h manager, g
 EXPORT_API int geofence_create_geopoint(int place_id, double latitude, double longitude, int radius, const char *address, geofence_h *fence)
 {
        GEOFENCE_LOGD("geofence_manager_create_geopoint");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(fence);
        GEOFENCE_NULL_ARG_CHECK(address);
        GEOFENCE_CHECK_CONDITION(place_id > 0, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER, "GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER");
@@ -778,9 +808,10 @@ EXPORT_API int geofence_create_geopoint(int place_id, double latitude, double lo
 EXPORT_API int geofence_create_bluetooth(int place_id, const char *bssid, const char *ssid, geofence_h *fence)
 {
        GEOFENCE_LOGD("geofence_create_bluetooth");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(fence);
        GEOFENCE_NULL_ARG_CHECK(bssid);
        GEOFENCE_NULL_ARG_CHECK(ssid);
@@ -793,9 +824,10 @@ EXPORT_API int geofence_create_bluetooth(int place_id, const char *bssid, const
 EXPORT_API int geofence_create_wifi(int place_id, const char *bssid, const char *ssid, geofence_h *fence)
 {
        GEOFENCE_LOGD("geofence_create_wifi");
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(fence);
        GEOFENCE_NULL_ARG_CHECK(bssid);
        GEOFENCE_NULL_ARG_CHECK(ssid);
@@ -807,9 +839,9 @@ EXPORT_API int geofence_create_wifi(int place_id, const char *bssid, const char
 
 EXPORT_API int geofence_destroy(geofence_h fence)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(fence);
        geofence_parameter_free((geofence_s *)fence);
        return GEOFENCE_MANAGER_ERROR_NONE;
@@ -817,9 +849,9 @@ EXPORT_API int geofence_destroy(geofence_h fence)
 
 EXPORT_API int geofence_get_type(geofence_h fence, geofence_type_e *type)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(fence);
        GEOFENCE_NULL_ARG_CHECK(type);
 
@@ -830,9 +862,9 @@ EXPORT_API int geofence_get_type(geofence_h fence, geofence_type_e *type)
 
 EXPORT_API int geofence_get_place_id(geofence_h fence, int *place_id)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(fence);
        GEOFENCE_NULL_ARG_CHECK(place_id);
 
@@ -843,9 +875,9 @@ EXPORT_API int geofence_get_place_id(geofence_h fence, int *place_id)
 
 EXPORT_API int geofence_get_latitude(geofence_h fence, double *latitude)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(fence);
        GEOFENCE_NULL_ARG_CHECK(latitude);
 
@@ -856,9 +888,9 @@ EXPORT_API int geofence_get_latitude(geofence_h fence, double *latitude)
 
 EXPORT_API int geofence_get_longitude(geofence_h fence, double *longitude)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(fence);
        GEOFENCE_NULL_ARG_CHECK(longitude);
 
@@ -869,9 +901,9 @@ EXPORT_API int geofence_get_longitude(geofence_h fence, double *longitude)
 
 EXPORT_API int geofence_get_radius(geofence_h fence, int *radius)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(fence);
        GEOFENCE_NULL_ARG_CHECK(radius);
 
@@ -882,9 +914,9 @@ EXPORT_API int geofence_get_radius(geofence_h fence, int *radius)
 
 EXPORT_API int geofence_get_address(geofence_h fence, char **address)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(fence);
        GEOFENCE_NULL_ARG_CHECK(address);
 
@@ -895,9 +927,9 @@ EXPORT_API int geofence_get_address(geofence_h fence, char **address)
 
 EXPORT_API int geofence_get_bssid(geofence_h fence, char **bssid)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(fence);
        GEOFENCE_NULL_ARG_CHECK(bssid);
 
@@ -908,9 +940,9 @@ EXPORT_API int geofence_get_bssid(geofence_h fence, char **bssid)
 
 EXPORT_API int geofence_get_ssid(geofence_h fence, char **ssid)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(fence);
        GEOFENCE_NULL_ARG_CHECK(ssid);
 
@@ -921,9 +953,9 @@ EXPORT_API int geofence_get_ssid(geofence_h fence, char **ssid)
 
 EXPORT_API int geofence_status_create(int geofence_id, geofence_status_h *status)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(status);
        GEOFENCE_CHECK_CONDITION(geofence_id > 0, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER, "GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER");
        GEOFENCE_LOGD("Allocating memory for new status");
@@ -941,9 +973,9 @@ EXPORT_API int geofence_status_create(int geofence_id, geofence_status_h *status
 
 EXPORT_API int geofence_status_destroy(geofence_status_h status)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(status);
 
        g_slice_free(geofence_status_s, ((geofence_status_s *)status));
@@ -952,9 +984,9 @@ EXPORT_API int geofence_status_destroy(geofence_status_h status)
 
 EXPORT_API int geofence_status_get_state(geofence_status_h status, geofence_state_e *state)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(status);
        GEOFENCE_NULL_ARG_CHECK(state);
 
@@ -971,9 +1003,9 @@ EXPORT_API int geofence_status_get_state(geofence_status_h status, geofence_stat
 
 EXPORT_API int geofence_status_get_duration(geofence_status_h status, int *seconds)
 {
-#ifndef ENABLE_GEOFENCE
-       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
-#endif
+       if (__is_geofence_feature_enabled() == false)
+                       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+
        GEOFENCE_NULL_ARG_CHECK(status);
        GEOFENCE_NULL_ARG_CHECK(seconds);