diff --git a/legacy/evas/README.in b/legacy/evas/README.in index 52bcaac379..1046d95c06 100644 --- a/legacy/evas/README.in +++ b/legacy/evas/README.in @@ -61,10 +61,6 @@ Notes: you need at least 1 image loader if you want to load images. gcc 3.0.x on solaris screws up the jpeg code so erroring out doesn't work. use gcc 3.2 on solaris. - freetype 2.1.2 is BAD. RedHat 8.0 uses this as do some debain distributions. - either downgrade to 2.1.1. freetype 2.1.3 is ALSO BAD, as is 2.0.9. It has - glyph metric rendering bugs and glyph geomery query bugs. do not use it. - try using 2.0.3. It is known to be stable and work perfectly with Evas. -------------------------------------------------------------------------- notes on features: diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in index 6fa4efeb7d..78e2facab9 100644 --- a/legacy/evas/configure.in +++ b/legacy/evas/configure.in @@ -427,23 +427,32 @@ AC_ARG_ENABLE(gl-x11, [ --enable-gl-x11 enable the OpenGL X11 d if test "x$have_evas_gl_x11" = "xyes"; then AC_CHECK_HEADER(GL/gl.h, [ - AC_CHECK_HEADER(X11/X.h, + AC_CHECK_HEADER(GL/glu.h, [ - AM_CONDITIONAL(BUILD_ENGINE_GL_X11, true) - AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) - AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) - AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) - x_dir=${x_dir:-/usr/X11R6}; - x_cflags=${x_cflags:--I$x_dir/include} - x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" - gl_cflags="-I/usr/include" - gl_libs="-lGL -lGLU -lpthread" - gl_dir="" - ENGINE_GL_X11_PRG="evas_gl_x11_test" + AC_CHECK_HEADER(X11/X.h, + [ + AM_CONDITIONAL(BUILD_ENGINE_GL_X11, true) + AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) + AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) + AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) + x_dir=${x_dir:-/usr/X11R6}; + x_cflags=${x_cflags:--I$x_dir/include} + x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" + gl_cflags="-I/usr/include" + gl_libs="-lGL -lGLU -lpthread" + gl_dir="" + ENGINE_GL_X11_PRG="evas_gl_x11_test" + ], [ + AM_CONDITIONAL(BUILD_ENGINE_GL_X11, false) + AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, false) + AC_MSG_RESULT(disabling GL X11 engine) + have_evas_gl_x11="no" + ] ], [ AM_CONDITIONAL(BUILD_ENGINE_GL_X11, false) AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, false) AC_MSG_RESULT(disabling GL X11 engine) + have_evas_gl_x11="no" ] ) ], [ @@ -456,6 +465,7 @@ if test "x$have_evas_gl_x11" = "xyes"; then else AM_CONDITIONAL(BUILD_ENGINE_GL_X11, false) AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, false) + have_evas_gl_x11="no" fi