forked from enlightenment/efl
* evas: Fix ticket #143 from Vincent Torri.
http://trac.enlightenment.org/e/ticket/143 SVN revision: 41565
This commit is contained in:
parent
e7f691a9f2
commit
faf1a51fee
|
@ -33,6 +33,14 @@ AC_PATH_XTRA
|
||||||
|
|
||||||
AC_CHECK_HEADER([X11/X.h], [have_dep="yes"])
|
AC_CHECK_HEADER([X11/X.h], [have_dep="yes"])
|
||||||
|
|
||||||
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
|
AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"])
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
|
AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"])
|
||||||
|
fi
|
||||||
|
|
||||||
if test "x${have_dep}" = "xyes" ; then
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
if test "x$2" = "xyes" ; then
|
if test "x$2" = "xyes" ; then
|
||||||
x_libs="${x_libs} -lX11 -lXext"
|
x_libs="${x_libs} -lX11 -lXext"
|
||||||
|
@ -71,6 +79,18 @@ AC_CHECK_HEADERS([X11/X.h X11/extensions/Xrender.h],
|
||||||
[have_dep="yes"],
|
[have_dep="yes"],
|
||||||
[have_dep="no"])
|
[have_dep="no"])
|
||||||
|
|
||||||
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
|
AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"])
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
|
AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"])
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
|
AC_CHECK_LIB([Xrender], [XRenderCreatePicture], [have_dep="yes"], [have_dep="no"])
|
||||||
|
fi
|
||||||
|
|
||||||
if test "x${have_dep}" = "xyes" ; then
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
if test "x$2" = "xyes" ; then
|
if test "x$2" = "xyes" ; then
|
||||||
x_libs="${x_libs} -lX11 -lXext"
|
x_libs="${x_libs} -lX11 -lXext"
|
||||||
|
@ -105,17 +125,29 @@ evas_engine_[]$1[]_libs=""
|
||||||
AC_PATH_X
|
AC_PATH_X
|
||||||
AC_PATH_XTRA
|
AC_PATH_XTRA
|
||||||
|
|
||||||
AC_CHECK_HEADERS([GL/gl.h GL/glu.h X11/X.h],
|
AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h X11/X.h],
|
||||||
[have_dep="yes"],
|
[have_dep="yes"],
|
||||||
[have_dep="no"])
|
[have_dep="no"])
|
||||||
|
|
||||||
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
|
AC_CHECK_LIB([X11], [XCreateColormap], [have_dep="yes"], [have_dep="no"])
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
|
AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"])
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
|
AC_CHECK_LIB([GLU], [gluNewTess], [have_dep="yes"], [have_dep="no"])
|
||||||
|
fi
|
||||||
|
|
||||||
if test "x${have_dep}" = "xyes" ; then
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
if test "x$2" = "xyes" ; then
|
if test "x$2" = "xyes" ; then
|
||||||
x_libs="${x_libs} -lX11 -lXext"
|
x_libs="${x_libs} -lX11 -lXext"
|
||||||
else
|
else
|
||||||
x_dir=${x_dir:-/usr/X11R6}
|
x_dir=${x_dir:-/usr/X11R6}
|
||||||
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
|
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
|
||||||
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
|
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11"
|
||||||
fi
|
fi
|
||||||
evas_engine_[]$1[]_cflags="-I/usr/include ${x_cflags}"
|
evas_engine_[]$1[]_cflags="-I/usr/include ${x_cflags}"
|
||||||
evas_engine_[]$1[]_libs="${x_libs} -lGL -lGLU -lpthread"
|
evas_engine_[]$1[]_libs="${x_libs} -lGL -lGLU -lpthread"
|
||||||
|
@ -510,6 +542,14 @@ AC_PATH_XTRA
|
||||||
|
|
||||||
AC_CHECK_HEADER([X11/X.h], [have_dep="yes"])
|
AC_CHECK_HEADER([X11/X.h], [have_dep="yes"])
|
||||||
|
|
||||||
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
|
AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"])
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
|
AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"])
|
||||||
|
fi
|
||||||
|
|
||||||
if test "x${have_dep}" = "xyes" ; then
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
if test "x$2" = "xyes" ; then
|
if test "x$2" = "xyes" ; then
|
||||||
x_libs="${x_libs} -lX11 -lXext"
|
x_libs="${x_libs} -lX11 -lXext"
|
||||||
|
|
Loading…
Reference in New Issue