diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index 1a52ce6c1a..c49965e7ec 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -1865,13 +1865,18 @@ ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm], [wayland-shm], [${want_ecore_evas_wayland_shm}], [Wayland Shm], [${have_ecore_wayland}], - [requirements_ecore_evas="ecore-wayland >= 1.1.0 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="${requirements_ecore_wayland} ${requirements_ecore_evas}"]) ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl], [wayland-egl], [${want_ecore_evas_wayland_egl}], [Wayland Egl], [${have_ecore_wayland}], - [requirements_ecore_evas="ecore-wayland >= 1.1.0 ${requirements_ecore_evas}"]) + [ + PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl], [have_wayland_egl="yes"], [have_wayland_egl="no"]) + if test "x${have_wayland_egl}" = "xyes" ; then + requirements_ecore_evas="wayland-egl ${requirements_ecore_wayland} ${requirements_ecore_evas}" + fi + ]) ### install and build examples diff --git a/legacy/ecore/src/lib/ecore_evas/Makefile.am b/legacy/ecore/src/lib/ecore_evas/Makefile.am index 88f036fe24..a1d9215df4 100644 --- a/legacy/ecore/src/lib/ecore_evas/Makefile.am +++ b/legacy/ecore/src/lib/ecore_evas/Makefile.am @@ -106,7 +106,8 @@ $(ECORE_WAYLAND_INC) \ $(ECORE_IPC_INC) \ @EVAS_CFLAGS@ \ @EINA_CFLAGS@ \ -@EVIL_CFLAGS@ +@EVIL_CFLAGS@ \ +@WAYLAND_EGL_CFLAGS@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -128,6 +129,7 @@ ecore_evas_wince.c \ ecore_evas_ews.c \ ecore_evas_psl1ght.c \ ecore_evas_wayland_shm.c \ +ecore_evas_wayland_egl.c \ ecore_evas_extn.c libecore_evas_la_LIBADD = \ @@ -148,7 +150,8 @@ $(top_builddir)/src/lib/ecore_input_evas/libecore_input_evas.la \ $(top_builddir)/src/lib/ecore/libecore.la \ @EVAS_LIBS@ \ @EINA_LIBS@ \ -@EVIL_LIBS@ +@EVIL_LIBS@ \ +@WAYLAND_EGL_LIBS@ libecore_evas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@