diff options
author | Carsten Haitzler <raster@rasterman.com> | 2011-04-25 09:42:49 +0000 |
---|---|---|
committer | Carsten Haitzler <raster@rasterman.com> | 2011-04-25 09:42:49 +0000 |
commit | b3a893c78c3a445ab2ef0b5487bcaba6a690cc6d (patch) | |
tree | 7f1253af25d8fa491cf28b57e081c2ca27fc9c9a /legacy/evas/m4/evas_check_engine.m4 | |
parent | 6b9fd11490eb49472c541aa7d4e25732f984a4a4 (diff) |
oops - didnt mean to commit that. that was just an example.
SVN revision: 58897
Diffstat (limited to '')
-rw-r--r-- | legacy/evas/m4/evas_check_engine.m4 | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/legacy/evas/m4/evas_check_engine.m4 b/legacy/evas/m4/evas_check_engine.m4 index f5dbe2439e..b1f60c7e3a 100644 --- a/legacy/evas/m4/evas_check_engine.m4 +++ b/legacy/evas/m4/evas_check_engine.m4 | |||
@@ -113,19 +113,16 @@ if test "x$gl_flavor_gles" = "xyes" ; then | |||
113 | fi | 113 | fi |
114 | 114 | ||
115 | if test "x${have_dep}" = "xyes" ; then | 115 | if test "x${have_dep}" = "xyes" ; then |
116 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.4.0], [have_dep="yes"], [have_dep="no"]) | 116 | if test "x$2" = "xyes" ; then |
117 | if test "x${have_dep}" = "xyes" ; then | 117 | x_libs="${x_libs} -lX11 -lXext -lXrender" |
118 | if test "x$2" = "xyes" ; then | 118 | else |
119 | x_libs="${x_libs} -lX11 -lXext -lXrender" | 119 | x_dir=${x_dir:-/usr/X11R6} |
120 | else | 120 | x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} |
121 | x_dir=${x_dir:-/usr/X11R6} | 121 | x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender" |
122 | x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} | 122 | fi |
123 | x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender" | 123 | evas_engine_[]$1[]_cflags="-I/usr/include ${x_cflags}" |
124 | fi | 124 | evas_engine_[]$1[]_libs="${x_libs} -lGL $gl_pt_lib" |
125 | evas_engine_[]$1[]_cflags="-I/usr/include ${x_cflags}" | 125 | evas_engine_gl_common_libs="-lGL $gl_pt_lib" |
126 | evas_engine_[]$1[]_libs="${x_libs} -lGL $gl_pt_lib" | ||
127 | evas_engine_gl_common_libs="-lGL $gl_pt_lib" | ||
128 | fi | ||
129 | else | 126 | else |
130 | if test "x$2" = "xyes" ; then | 127 | if test "x$2" = "xyes" ; then |
131 | x_libs="${x_libs} -lX11 -lXext -lXrender" | 128 | x_libs="${x_libs} -lX11 -lXext -lXrender" |
@@ -150,16 +147,13 @@ else | |||
150 | if test "x${have_egl}" = "xyes" ; then | 147 | if test "x${have_egl}" = "xyes" ; then |
151 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) | 148 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) |
152 | if test "x${have_glesv2}" = "xyes" ; then | 149 | if test "x${have_glesv2}" = "xyes" ; then |
153 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.4.0], [have_dep="yes"], [have_dep="no"]) | 150 | evas_engine_[]$1[]_cflags="${x_cflags}" |
154 | if test "x${have_dep}" = "xyes" ; then | 151 | evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" |
155 | evas_engine_[]$1[]_cflags="${x_cflags}" | 152 | evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" |
156 | evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" | 153 | have_dep="yes" |
157 | evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" | 154 | gl_flavor_gles="no" |
158 | have_dep="yes" | 155 | AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support]) |
159 | gl_flavor_gles="no" | 156 | gles_variety_sgx="yes" |
160 | AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support]) | ||
161 | gles_variety_sgx="yes" | ||
162 | fi | ||
163 | fi | 157 | fi |
164 | fi | 158 | fi |
165 | fi | 159 | fi |