summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorRafael Antognolli <antognolli@gmail.com>2012-11-07 13:31:31 +0000
committerRafael Antognolli <antognolli@gmail.com>2012-11-07 13:31:31 +0000
commit0d19a3b349f55f925aa16c67cbb10e5ff9f61888 (patch)
tree463981f73358ab8418e5a412884e7aee87d170f9 /m4
parent99ce2c390e277ab1107c69bae91878c3c3458f83 (diff)
Evas: build gl_xlib and gl_xcb even when gles flavor is selected.
SVN revision: 78968
Diffstat (limited to 'm4')
-rw-r--r--m4/evas_check_engine.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index d81829a..ed5aa50 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -161,7 +161,7 @@ else
161 ]) 161 ])
162 if test "x${have_egl}" = "xyes" ; then 162 if test "x${have_egl}" = "xyes" ; then
163 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) 163 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
164 if test "x${have_dep}" = "xyes" ; then 164 if test "x${have_glesv2}" = "xyes" ; then
165 evas_engine_[]$1[]_cflags="${x_cflags}" 165 evas_engine_[]$1[]_cflags="${x_cflags}"
166 evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" 166 evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
167 evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" 167 evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
@@ -333,7 +333,7 @@ else
333 ]) 333 ])
334 if test "x${have_egl}" = "xyes" ; then 334 if test "x${have_egl}" = "xyes" ; then
335 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) 335 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
336 if test "x${have_dep}" = "xyes" ; then 336 if test "x${have_glesv2}" = "xyes" ; then
337 evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}" 337 evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}"
338 evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" 338 evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
339 evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" 339 evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"