ecore_con: enable other builds, not only wayland

@tizen_fix

Change-Id: I836a960fdddabd7686120da00a32a64201e90f17

diff --git a/configure.ac b/configure.ac
index a98d2eb..3e3faaa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2582,8 +2582,10 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eina])
 EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [ecore])
 EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [emile])
 ### TIZEN ONLY (151223): request e19 compositor to create sockets
-EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [ecore-wayland])
-PKG_CHECK_MODULES([ECORE_CON], [wayland-server tizen-extension-client])
+if test "x${want_wayland}" = "xyes"; then
+   EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [ecore-wayland])
+   PKG_CHECK_MODULES([ECORE_CON], [wayland-server tizen-extension-client])
+fi
 ### TIZEN ONLY: END
 
 EFL_ADD_LIBS([ECORE_CON], [-lm])

diff --git a/src/lib/ecore_con/ecore_con_local.c b/src/lib/ecore_con/ecore_con_local.c
index 3ed3417..c9496e2 100644 (file)
--- a/src/lib/ecore_con/ecore_con_local.c
+++ b/src/lib/ecore_con/ecore_con_local.c
@@ -28,9 +28,11 @@
 #include "Ecore_Con.h"
 #include "ecore_con_private.h"
 // TIZEN ONLY (151223): request e19 compositor to create socket
-#include "Ecore_Wayland.h"
-#include <wayland-server.h>
-#include <tizen-extension-client-protocol.h>
+#if HAVE_ECORE_WAYLAND
+# include "Ecore_Wayland.h"
+# include <wayland-server.h>
+# include <tizen-extension-client-protocol.h>
+#endif
 // TIZEN ONLY: END
 
 #define LENGTH_OF_SOCKADDR_UN(s)                (strlen((s)->sun_path) +                 \
@@ -73,6 +75,7 @@ ecore_con_local_shutdown(void)
 }
 
 // TIZEN ONLY (151223): request e19 compositor to create socket
+#if HAVE_ECORE_WAYLAND
 static void
 _ecore_con_compositor_socket(void *data, struct tizen_embedded_compositor *tec EINA_UNUSED, int fd)
 {
@@ -129,6 +132,14 @@ _ecore_con_local_get_socket_from_server()
    tizen_embedded_compositor_destroy(tec);
    return fd;
 }
+#else
+static int
+_ecore_con_local_get_socket_from_server()
+{
+   DBG("Just return -1");
+   return -1;
+}
+#endif
 // TIZEN ONLY: END
 
 int