Remove ecore_x for pure Wayland build.

Change-Id: Idfc718b9754b8f90578ac9da80d83ed93368cb78
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd5ba5d..6b4d14f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,8 +24,13 @@ PROJECT(${fw_name} C)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 INCLUDE(FindPkgConfig)
+IF(X11_SUPPORT)
 pkg_check_modules(pkgs REQUIRED dlog glib-2.0 gio-2.0 nfc-common nfc capi-base-common
        vconf ecore-x)
+ELSE()
+pkg_check_modules(pkgs REQUIRED dlog glib-2.0 gio-2.0 nfc-common nfc capi-base-common
+       vconf)
+ENDIF(X11_SUPPORT)
 FOREACH(flag ${pkgs_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
@@ -37,6 +42,9 @@ IF("${ARCH}" STREQUAL "arm")
     ADD_DEFINITIONS("-DTARGET")
 ENDIF("${ARCH}" STREQUAL "arm")
 
+IF(X11_SUPPORT)
+    ADD_DEFINITIONS("-DHAVE_X11")
+ENDIF(X11_SUPPORT)
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")

diff --git a/packaging/capi-network-nfc.spec b/packaging/capi-network-nfc.spec
index e0f0d22..7867f6f 100644 (file)
--- a/packaging/capi-network-nfc.spec
+++ b/packaging/capi-network-nfc.spec
@@ -1,3 +1,5 @@
+%bcond_with x
+
 Name:       capi-network-nfc
 Summary:    NFC Core API
 Version:    0.1.5
@@ -14,7 +16,9 @@ BuildRequires:  nfc-client-lib-devel
 BuildRequires:  nfc-common-devel
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(vconf)
+%if %{with x}
 BuildRequires:  pkgconfig(ecore-x)
+%endif
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -37,7 +41,12 @@ cp %{SOURCE1001} .
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \
+%if %{with x}
+         -DX11_SUPPORT=On
+%else
+         -DX11_SUPPORT=Off
+%endif
 
 make %{?jobs:-j%jobs}
 

diff --git a/src/nfc.c b/src/nfc.c
index 33263c7..860ce58 100644 (file)
--- a/src/nfc.c
+++ b/src/nfc.c
@@ -19,7 +19,9 @@
 #include <gio/gio.h>
 
 #include <vconf.h>
+#ifdef HAVE_X11
 #include <Ecore_X.h>
+#endif
 #include <net_nfc_typedef_internal.h>
 
 #include "nfc_internal.h"
@@ -93,6 +95,7 @@ static _nfc_context_s gdbus_nfc_context;
 
 static pid_t _get_focus_app_pid()
 {
+#ifdef HAVE_X11
        Ecore_X_Window focus;
        pid_t pid;
 
@@ -102,6 +105,7 @@ static pid_t _get_focus_app_pid()
        if (ecore_x_netwm_pid_get(focus, &pid))
                return pid;
 
+#endif
        return -1;
 }