projects / platform / upstream / enlightenment.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
e_comp_wl: remove the use of session-recovery protocol
[platform/upstream/enlightenment.git] / configure.ac
diff --git a/configure.ac b/configure.ac
index 964f6e8..ab07f45 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,7 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_MKDIR_P
 AC_C_BIGENDIAN
 AC_PROG_CC_C99
+AC_PROG_CXX
 AM_PROG_CC_C_O
 AC_FUNC_ALLOCA
 
@@ -266,17 +267,6 @@ AC_ARG_ENABLE([function-trace],
 AC_MSG_CHECKING([whether enlightenment function trace is enabled])
 AC_MSG_RESULT([${function_trace}])
 
-hwc_multi_plane=no
-AC_ARG_ENABLE([hwc-multi],
-  AS_HELP_STRING([--enable-hwc-multi],[]),
-  [
-   hwc_multi_plane=yes
-   AC_DEFINE_UNQUOTED([ENABLE_HWC_MULTI], [1], [enable hwc multi])
-  ],
-  [hwc_multi_plane=no])
-AC_MSG_CHECKING([whether enlightenment hwc using multi plane is enabled])
-AC_MSG_RESULT([${hwc_multi_plane}])
-
 e_requires="\
   evas >= $efl_version \
   ecore >= $efl_version \
@@ -303,6 +293,8 @@ PKG_CHECK_MODULES(E_INFO, [
   ecore >= ${efl_version}
   eldbus >= ${efl_version}
   xkbcommon
+  capi-media-streamrecorder
+  wayland-client
 ])
 
 PKG_CHECK_EXISTS([xkeyboard-config],[
@@ -376,9 +368,9 @@ shm_unlink("/");
 LIBS=${LIBS_save}
 AC_MSG_RESULT([${have_shm_open}])
 AC_SUBST(SHM_OPEN_LIBS)
-                           
+
 if test "x${e_cv_want_wayland_only}" != "xno" || test "x${e_cv_want_wayland_clients}" != "xno";then
-  PKG_CHECK_MODULES([WAYLAND], [wayland-server >= 1.8.0 xkbcommon uuid xdg-shell-server scaler-server transform-server screenshooter-server tizen-extension-server tizen-launch-server eom-server],
+  PKG_CHECK_MODULES([WAYLAND], [wayland-server >= 1.8.0 xkbcommon uuid xdg-shell-unstable-v5-server xdg-shell-unstable-v6-server tizen-remote-surface-server scaler-server screenshooter-server tizen-extension-server tizen-launch-server tizen-surface-server tizen-dpms-server eom-server presentation-time-server tizen-hwc-server linux-explicit-synchronization-unstable-v1-server wtz-foreign-server wtz-screen-server wtz-shell-server],
     [
       have_wayland=yes
       AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland support])
@@ -394,7 +386,6 @@ if test "x${have_wayland}" = "xyes"; then
   fi
 
   have_wayland_tbm=no
-  have_remote_surface=no
   AC_ARG_ENABLE([wayland-tbm],
     AS_HELP_STRING([--enable-wayland-tbm],[enable wayland-tbm @<:@default=enabled@:>@]),
     [e_cv_want_wayland_tbm=$enableval],
@@ -408,15 +399,6 @@ if test "x${have_wayland}" = "xyes"; then
         have_wayland_tbm=yes
         AC_DEFINE_UNQUOTED([HAVE_WAYLAND_TBM],[1],[enable wayland-tbm support])
       ])
-
-    if test "x${have_wayland_tbm}" = "xyes"; then
-    PKG_CHECK_MODULES([TIZEN_REMOTE_SURFACE], [tizen-remote-surface-server],
-      [
-        have_remote_surface=yes
-        AC_DEFINE_UNQUOTED([HAVE_REMOTE_SURFACE], [1], [enable tizen-retmoe-surface support])
-      ])
-    fi
-
   else
     have_wayland_tbm=no
   fi
@@ -489,16 +471,21 @@ AC_MSG_CHECKING([Have dlog logger])
 AC_MSG_RESULT([${have_dlog}])
 if test "x${have_dlog}" = "xyes"; then
     AC_DEFINE([HAVE_DLOG], [1], [Define to 1 if you have dlog])
+    PKG_CHECK_MODULES(DLOG, dlog)
 fi
 
+AM_CONDITIONAL([HAVE_DLOG], [test "x${have_dlog}" = "xyes"])
+
 AM_CONDITIONAL([HAVE_WAYLAND], [test "x${have_wayland}" = "xyes"])
 AM_CONDITIONAL([HAVE_WAYLAND_TBM], [test "x${have_wayland_tbm}" = "xyes"])
-AM_CONDITIONAL([HAVE_REMOTE_SURFACE], [test "x${have_remote_surface}" = "xyes"])
 AM_CONDITIONAL([HAVE_HWC], [test "x${have_hwc}" = "xyes"])
 
 #pixman
 PKG_CHECK_MODULES([PIXMAN], [pixman-1])
 
+#egl
+PKG_CHECK_MODULES([EGL], [egl])
+
 # Check for systemd
 want_systemd="yes"
 AC_ARG_ENABLE([systemd],
@@ -529,6 +516,18 @@ AM_CONDITIONAL([HAVE_SYSTEMD], [test "x${have_systemd}" = "xyes"])
 #libinput
 PKG_CHECK_MODULES([LIBINPUT], [libinput])
 
+have_extra_touch_event="no"
+AC_CHECK_LIB(input, libinput_event_touch_get_major, [have_extra_touch_event="yes"])
+if test "x${have_extra_touch_event}" = "xyes";then
+AC_DEFINE_UNQUOTED([LIBINPUT_SUPPORT_EXTRA_TOUCH_EVENT], [1], [libinput support extra touch event])
+fi
+
+have_scroll_value_v120="no"
+AC_CHECK_LIB(input, libinput_event_pointer_get_scroll_value_v120, [have_scroll_value_v120="yes"])
+if test "x${have_scroll_value_v120}" = "xyes";then
+AC_DEFINE_UNQUOTED([LIBINPUT_HAVE_SCROLL_VALUE_V120], [1], [libinput have get_scroll_value_v120])
+fi
+
 #capi-system-device
 PKG_CHECK_MODULES([CAPI_SYSTEM_DEVICE],
                   [capi-system-device])
@@ -545,22 +544,16 @@ PKG_CHECK_MODULES(TZSH,
                   [tzsh-server],
                   [have_tzsh="yes"])
 
+#gmock
+PKG_CHECK_MODULES(GMOCK,
+                  [gmock],
+                  [have_gmock]="yes")
+
 POLICY_CFLAGS="${CAPI_SYSTEM_DEVICE_CFLAGS} ${CYNARA_CFLAGS} ${TZSH_CFLAGS}"
 POLICY_LIBS="${CAPI_SYSTEM_DEVICE_LIBS} ${CYNARA_LIBS} ${TZSH_LIBS}"
 AC_SUBST(POLICY_CFLAGS)
 AC_SUBST(POLICY_LIBS)
 
-WL_DESKTOP_SHELL=false
-define([CHECK_MODULE_WL_DESKTOP_SHELL],
-[
-  if test "x${have_wayland}" = "xyes"; then
-    AC_E_CHECK_PKG(WL_DESKTOP_SHELL, [ ecore >= $efl_version eina >= $efl_version ], [WL_DESKTOP_SHELL=true], [WL_DESKTOP_SHELL=false])
-  else
-    WL_DESKTOP_SHELL=false
-  fi
-])
-AM_CONDITIONAL([HAVE_WL_DESKTOP_SHELL], [test "x${WL_DESKTOP_SHELL}" = "xtrue"])
-
 define([CHECK_MODULE_BUFFERQUEUE],
 [
   if test "x${have_wayland_clients}" = "xyes" || test "x${e_cv_want_wayland_only}" = "xyes"; then
@@ -571,7 +564,6 @@ define([CHECK_MODULE_BUFFERQUEUE],
 ])
 AM_CONDITIONAL([HAVE_BUFFERQUEUE], [test "x${BUFFERQUEUE}" = "xtrue"])
 
-AC_E_OPTIONAL_MODULE([wl_desktop_shell], $have_wayland, [CHECK_MODULE_WL_DESKTOP_SHELL])
 AC_E_OPTIONAL_MODULE([bufferqueue], $have_wayland, [CHECK_MODULE_BUFFERQUEUE])
 
 if test "x${have_wayland}" = "xyes"; then
@@ -600,8 +592,8 @@ eo >= ${efl_version} \
 eeze >= ${efl_version} \
 "
 
-e_libs="$E_LIBS $fnmatch_libs $execinfo_libs"
-e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS -D_F_ZONE_WINDOW_ROTATION_ -D_F_E_VIRTUAL_KEYBOARD_TYPE_ -D_F_E_CLIENT_NEW_CLIENT_POST_HOOK_ -D_F_E_COMP_OBJECT_INTERCEPT_HOOK_ -D_F_TRANSIENT_FOR_PATCH -D_F_DISABLE_BACKLIGHT_MOD_SUPPORT"
+e_libs="$E_LIBS $fnmatch_libs $execinfo_libs $DLOG_LIBS"
+e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS -D_F_ZONE_WINDOW_ROTATION_ -D_F_E_VIRTUAL_KEYBOARD_TYPE_ -D_F_E_CLIENT_NEW_CLIENT_POST_HOOK_ -D_F_E_COMP_OBJECT_INTERCEPT_HOOK_ -D_F_TRANSIENT_FOR_PATCH -D_F_DISABLE_BACKLIGHT_MOD_SUPPORT $DLOG_CFLAGS"
 e_configflags="-DUSE_E_CONFIG_H -D_F_ZONE_WINDOW_ROTATION_ -D_F_E_VIRTUAL_KEYBOARD_TYPE_ -D_F_E_CLIENT_NEW_CLIENT_POST_HOOK_ -D_F_E_COMP_OBJECT_INTERCEPT_HOOK_ -D_F_TRANSIENT_FOR_PATCH -D_F_DISABLE_BACKLIGHT_MOD_SUPPORT"
 
 AC_SUBST([e_libs])
@@ -636,9 +628,8 @@ AC_SUBST([SUID_LDFLAGS])
 
 AC_OUTPUT([
 Makefile
-enlightenment.spec
+tests/Makefile
 enlightenment.pc
-src/modules/wl_desktop_shell/module.desktop
 ])
 
 # report
Domain: Graphics System / Display Server;