From 0462bc63c346e73efae1cdd1a377ccd2bc42e919 Mon Sep 17 00:00:00 2001 From: Woochan Lee Date: Thu, 23 Feb 2017 14:31:38 +0900 Subject: [PATCH] Disabled elementary_quicklaunch. Change-Id: Ide4e2b8301b4d49d0053bbef982021318c27c983 --- configure.ac | 31 ++++++++++++++++++------------- packaging/elementary.spec | 6 ++++-- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 0accc5f21..b44e61c13 100644 --- a/configure.ac +++ b/configure.ac @@ -452,29 +452,34 @@ 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${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${have_dlopen}" = "xno"; then +# AC_CHECK_FUNCS([dlopen dladdr]) +#fi -if test "x${ac_cv_func_dlopen}" = "xyes"; then - have_dlopen="yes" -fi +#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"]) +AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x${temp}" = "xyes"]) +#////////////////////////////////////////////////////////////////////////////////////////////////////////////// -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 66aa18386..c66fe24a4 100644 --- a/packaging/elementary.spec +++ b/packaging/elementary.spec @@ -228,8 +228,10 @@ install -m 0644 %SOURCE100 %{buildroot}%{_tmpfilesdir}/elementary.conf %manifest %{name}.manifest %defattr(-,root,root,-) %license COPYING -%{_bindir}/elementary_quicklaunch -%{_bindir}/elementary_run +#TIZEN_ONLY(20170221) : Not used in Tizen. +#%{_bindir}/elementary_quicklaunch +#%{_bindir}/elementary_run +# %{_libdir}/edje/* %{_libdir}/elementary/modules/* %{_libdir}/*.so.* -- 2.34.1