Revert "Disabled elementary_quicklaunch."

TC failure can be caused.

This reverts commit 0462bc63c346e73efae1cdd1a377ccd2bc42e919.

Change-Id: Ieabd31a242f51df1354d563071a3423e544c2a63

diff --git a/configure.ac b/configure.ac
index 1f87e57..f412863 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -447,34 +447,29 @@ EFL_CHECK_PATH_MAX
 
 EFL_LINKER_FLAG([-fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries])
 
-#TIZEN_ONLY(20170221) : Not used in Tizen.
-#//////////////////////////////////////////////////////////////////////////////////////////////////////////////
 # Check if we can build binary with quicklaunch support
-#ELM_QUICKLAUNCH
+ELM_QUICKLAUNCH
 
 
 ### Checks for library functions
 
-#AC_FUNC_ALLOCA
+AC_FUNC_ALLOCA
 
-#AC_CHECK_FUNCS([geteuid getuid getpwent])
+AC_CHECK_FUNCS([geteuid getuid getpwent])
 
-#if test "x${want_quicklaunch}" != "xno"; then
-#   AC_CHECK_FUNCS([fork clearenv])
-#fi
-
-#if test "x${have_dlopen}" = "xno"; then
-#   AC_CHECK_FUNCS([dlopen dladdr])
-#fi
+if test "x${want_quicklaunch}" != "xno"; then
+   AC_CHECK_FUNCS([fork clearenv])
+fi
 
-#if test "x${ac_cv_func_dlopen}" = "xyes"; then
-#   have_dlopen="yes"
-#fi
+if test "x${have_dlopen}" = "xno"; then
+   AC_CHECK_FUNCS([dlopen dladdr])
+fi
 
-#AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x${ac_cv_func_fork}" = "xyes" && test "x${have_dlopen}" = "xyes"])
-AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x${temp}" = "xyes"])
-#//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+if test "x${ac_cv_func_dlopen}" = "xyes"; then
+   have_dlopen="yes"
+fi
 
+AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x${ac_cv_func_fork}" = "xyes" && test "x${have_dlopen}" = "xyes"])
 
 # environ variable
 

diff --git a/packaging/elementary.spec b/packaging/elementary.spec
index 8d7ed34..833fc87 100644 (file)
--- a/packaging/elementary.spec
+++ b/packaging/elementary.spec
@@ -168,10 +168,8 @@ install -m 0644 %SOURCE100 %{buildroot}%{_tmpfilesdir}/elementary.conf
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %license COPYING
-#TIZEN_ONLY(20170221) : Not used in Tizen.
-#%{_bindir}/elementary_quicklaunch
-#%{_bindir}/elementary_run
-#
+%{_bindir}/elementary_quicklaunch
+%{_bindir}/elementary_run
 %{_libdir}/edje/*
 %{_libdir}/elementary/modules/*
 %{_libdir}/*.so.*