forked from enlightenment/efl
Ecore & Ecore_Evas: Fix requirements in configure.ac for wayland_egl.
Fix ecore_evas makefile to use wayland_egl_libs, etc. SVN revision: 67081
This commit is contained in:
parent
1ccaf36197
commit
54cca7bbf0
|
@ -1865,13 +1865,18 @@ ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm], [wayland-shm],
|
||||||
[${want_ecore_evas_wayland_shm}],
|
[${want_ecore_evas_wayland_shm}],
|
||||||
[Wayland Shm],
|
[Wayland Shm],
|
||||||
[${have_ecore_wayland}],
|
[${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],
|
ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl], [wayland-egl],
|
||||||
[${want_ecore_evas_wayland_egl}],
|
[${want_ecore_evas_wayland_egl}],
|
||||||
[Wayland Egl],
|
[Wayland Egl],
|
||||||
[${have_ecore_wayland}],
|
[${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
|
### install and build examples
|
||||||
|
|
||||||
|
|
|
@ -106,7 +106,8 @@ $(ECORE_WAYLAND_INC) \
|
||||||
$(ECORE_IPC_INC) \
|
$(ECORE_IPC_INC) \
|
||||||
@EVAS_CFLAGS@ \
|
@EVAS_CFLAGS@ \
|
||||||
@EINA_CFLAGS@ \
|
@EINA_CFLAGS@ \
|
||||||
@EVIL_CFLAGS@
|
@EVIL_CFLAGS@ \
|
||||||
|
@WAYLAND_EGL_CFLAGS@
|
||||||
|
|
||||||
AM_CFLAGS = @WIN32_CFLAGS@
|
AM_CFLAGS = @WIN32_CFLAGS@
|
||||||
|
|
||||||
|
@ -128,6 +129,7 @@ ecore_evas_wince.c \
|
||||||
ecore_evas_ews.c \
|
ecore_evas_ews.c \
|
||||||
ecore_evas_psl1ght.c \
|
ecore_evas_psl1ght.c \
|
||||||
ecore_evas_wayland_shm.c \
|
ecore_evas_wayland_shm.c \
|
||||||
|
ecore_evas_wayland_egl.c \
|
||||||
ecore_evas_extn.c
|
ecore_evas_extn.c
|
||||||
|
|
||||||
libecore_evas_la_LIBADD = \
|
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 \
|
$(top_builddir)/src/lib/ecore/libecore.la \
|
||||||
@EVAS_LIBS@ \
|
@EVAS_LIBS@ \
|
||||||
@EINA_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@
|
libecore_evas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue