wl_desktop_shell: Check whether enable of input panel.

Change-Id: Id3c09e1f91cbd73404c86c5a2f3e17b668408c5c

diff --git a/src/modules/Makefile_wl_desktop_shell.mk b/src/modules/Makefile_wl_desktop_shell.mk
index 6ab2d67cb076a10fba65f58f86638d3830a1bb8e..8810ac5f9321ddbb031ec2ee96d68908ce99c3eb 100644 (file)
--- a/src/modules/Makefile_wl_desktop_shell.mk
+++ b/src/modules/Makefile_wl_desktop_shell.mk
@@ -17,10 +17,14 @@ src_modules_wl_desktop_shell_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_wl_desktop_shell_module_la_SOURCES = \
   src/modules/wl_desktop_shell/e_mod_main.c \
   src/modules/wl_desktop_shell/e_mod_main.h \
-  src/modules/wl_desktop_shell/e_mod_input_panel.c \
   src/modules/wl_desktop_shell/e_scaler.c \
   src/modules/wl_desktop_shell/e_scaler.h
 
+if USE_MODULE_WL_TEXT_INPUT
+src_modules_wl_desktop_shell_module_la_SOURCES += \
+  src/modules/wl_desktop_shell/e_mod_input_panel.c
+endif
+
 PHONIES += wl_desktop_shell install-wl_desktop_shell
 wl_desktop_shell: $(wl_desktop_shellpkg_LTLIBRARIES) $(wl_desktop_shell_DATA)
 install-wl_desktop_shell: install-wl_desktop_shellDATA install-wl_desktop_shellpkgLTLIBRARIES

diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c
index 497c66b840cffad8e5e0430b5b7b70fbb5f995ad..2d6e192c8e8117a670f6d0b004647f46085814c7 100644 (file)
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -1518,7 +1518,9 @@ e_modapi_init(E_Module *m)
 E_API int
 e_modapi_shutdown(E_Module *m EINA_UNUSED)
 {
+#ifdef HAVE_WL_TEXT_INPUT
    e_input_panel_shutdown();
+#endif
 
    return 1;
 }

diff --git a/src/modules/wl_desktop_shell/e_mod_main.h b/src/modules/wl_desktop_shell/e_mod_main.h
index 6a8a75c063253b99d1fce48846ffc5e3ee7d484a..bb336061a985655e21cf4d3e59d02c7f4c7c2a31 100644 (file)
--- a/src/modules/wl_desktop_shell/e_mod_main.h
+++ b/src/modules/wl_desktop_shell/e_mod_main.h
@@ -1,7 +1,13 @@
 #ifndef _E_MOD_MAIN_H
 #define _E_MOD_MAIN_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#ifdef HAVE_WL_TEXT_INPUT
 Eina_Bool   e_input_panel_init(void);
 void        e_input_panel_shutdown(void);
+#endif /* HAVE_WL_TEXT_INPUT */
 
 #endif