Remove unnecessary build configuration 37/113937/3
authorJihoon Kim <jihoon48.kim@samsung.com>
Thu, 9 Feb 2017 10:01:00 +0000 (19:01 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Fri, 10 Feb 2017 01:55:23 +0000 (10:55 +0900)
Change-Id: Ib09d6d7ecb8b1c6b86dad853c2df057cfebfb06a
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
configure.ac
ism/modules/panelagent/wayland/Makefile.am

index 9157cbf..8b44dc2 100644 (file)
@@ -520,11 +520,6 @@ AC_ARG_ENABLE(panel-efl,
               enable_panel_efl=no,
               enable_panel_efl=check)
 
-AC_ARG_ENABLE(wsc-efl,
-              [  --disable-wsc-efl       Do not build EFL Wsc],
-              enable_wsc_efl=no,
-              enable_wsc_efl=yes)
-
 AC_ARG_ENABLE(tray-icon,
               [  --disable-tray-icon       Do not build Tray Icon],
               enable_tray_icon=no,
@@ -668,13 +663,6 @@ else
   enable_wayland_immodule=no
 fi
 
-if test "$enable_wsc_efl" = "yes" -a "$ISF_HAS_ELM" = "yes"; then
-  ISF_BUILD_WSC_EFL=1
-else
-  ISF_BUILD_WSC_EFL=0
-  enable_wsc_efl=no
-fi
-
 ISF_BUILD_PANEL_EFL=0
 if test "$enable_panel_efl" != "no"; then
   enable_panel_efl=no
@@ -758,9 +746,6 @@ AM_CONDITIONAL(ISF_BUILD_EFL_IMMODULE,
 AM_CONDITIONAL(ISF_BUILD_WAYLAND_IMMODULE,
                 [test "$enable_wayland_immodule" = "yes"])
 
-AM_CONDITIONAL(ISF_BUILD_WSC_EFL,
-                [test "$enable_wsc_efl" = "yes"])
-
 AM_CONDITIONAL(ISF_BUILD_PANEL_EFL,
                 [test "$enable_panel_efl" = "yes"])
 
@@ -891,7 +876,6 @@ Module options:
   Wayland IMModule dir     $WAYLAND_IM_MODULEDIR
 
   EFL  Panel GUI           $enable_panel_efl
-  EFL  Wsc GUI             $enable_wsc_efl
 
   Enable TrayIcon          $enable_tray_icon
   Enable MultiWindow       $enable_multiwindow_support
index d1b69d9..d0bf25d 100644 (file)
@@ -22,9 +22,7 @@ noinst_HEADERS = isf_wsc_context.h \
                                        isf_wsc_control.h \
                                        isf_wsc_control_ui.h
 
-#if ISF_BUILD_WSC_EFL
 CONFIG_WSC_PANELAGENT_MODULE  = wayland.la
-#endif
 
 if SCIM_LD_VERSION_SCRIPT
 LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/wayland.version-script"