summaryrefslogtreecommitdiff
path: root/legacy/evas/m4/evas_check_engine.m4
diff options
context:
space:
mode:
authorRafael Antognolli <antognolli@gmail.com>2012-10-26 18:54:52 +0000
committerRafael Antognolli <antognolli@gmail.com>2012-10-26 18:54:52 +0000
commitd8cbc868258d97f657fdf247fdecb09db132fc4a (patch)
treef6c7e3dec1a71982aa368f35034733609fd7c8de /legacy/evas/m4/evas_check_engine.m4
parent60dfe259c8062c6462920cb42be7d7b304277728 (diff)
evas/wayland_egl: Don't check and link against gl AND glesv2.
Only one of them is necessary, based on the gl_flavor_gles flag. Also remove some extra checks and added link flags, since they are already done by pkg-config. SVN revision: 78555
Diffstat (limited to '')
-rw-r--r--legacy/evas/m4/evas_check_engine.m419
1 files changed, 8 insertions, 11 deletions
diff --git a/legacy/evas/m4/evas_check_engine.m4 b/legacy/evas/m4/evas_check_engine.m4
index 97de0eb336..fbed024fe1 100644
--- a/legacy/evas/m4/evas_check_engine.m4
+++ b/legacy/evas/m4/evas_check_engine.m4
@@ -739,11 +739,17 @@ have_dep="no"
739evas_engine_[]$1[]_cflags="" 739evas_engine_[]$1[]_cflags=""
740evas_engine_[]$1[]_libs="" 740evas_engine_[]$1[]_libs=""
741 741
742if test "x${gl_flavor_gles}" = "xyes" ; then
743 gl_library="glesv2"
744else
745 gl_library="gl"
746fi
747
742PKG_CHECK_MODULES([WAYLAND_EGL], 748PKG_CHECK_MODULES([WAYLAND_EGL],
743 [egl >= 7.10 glesv2 gl wayland-client wayland-egl], 749 [egl >= 7.10 ${gl_library} wayland-client wayland-egl],
744 [ 750 [
745 have_dep="yes" 751 have_dep="yes"
746 requirement="egl >= 7.10 glesv2 gl wayland-client wayland-egl" 752 requirement="egl >= 7.10 ${gl_library} wayland-client wayland-egl"
747 evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" 753 evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
748 evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}" 754 evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}"
749 ],[ 755 ],[
@@ -751,15 +757,6 @@ PKG_CHECK_MODULES([WAYLAND_EGL],
751 ] 757 ]
752) 758)
753 759
754if test "x${have_dep}" = "xyes" ; then
755 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
756 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm)
757 if test "x${have_glesv2}" = "xyes" ; then
758 evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
759 evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGL -lGLESv2 -lEGL"
760 fi
761fi
762
763AC_SUBST([evas_engine_$1_cflags]) 760AC_SUBST([evas_engine_$1_cflags])
764AC_SUBST([evas_engine_$1_libs]) 761AC_SUBST([evas_engine_$1_libs])
765 762