forked from enlightenment/efl
efl: fix internal usage of pkg-config
Still was some checks in ecore to find efl stuff with pkg-config. Use directly values from evas checks. SVN revision: 80446
This commit is contained in:
parent
88ba56d9d5
commit
5130ed35c7
12
configure.ac
12
configure.ac
|
@ -3584,14 +3584,14 @@ ECORE_EVAS_CHECK_MODULE_FULL([software-x11],
|
||||||
have_ecore_evas_software_xlib="no"
|
have_ecore_evas_software_xlib="no"
|
||||||
have_ecore_evas_software_xcb="no"
|
have_ecore_evas_software_xcb="no"
|
||||||
if test "x$have_ecore_evas_software_x11" = "xyes" ; then
|
if test "x$have_ecore_evas_software_x11" = "xyes" ; then
|
||||||
have_ecore_evas_software_xlib=`${PKG_CONFIG} --variable=Xlib evas-software-x11`
|
have_ecore_evas_software_xlib=${have_evas_engine_software_xlib}
|
||||||
if test "x${have_ecore_evas_software_xlib}" = "xstatic"; then
|
if test "x${have_ecore_evas_software_xlib}" = "xstatic"; then
|
||||||
have_ecore_evas_software_xlib="yes"
|
have_ecore_evas_software_xlib="yes"
|
||||||
fi
|
fi
|
||||||
if test "x${have_ecore_evas_software_xlib}" = "xyes" && test "x${have_ecore_x_xlib}" = "xyes" ; then
|
if test "x${have_ecore_evas_software_xlib}" = "xyes" && test "x${have_ecore_x_xlib}" = "xyes" ; then
|
||||||
AC_DEFINE([BUILD_ECORE_EVAS_SOFTWARE_XLIB], [1], [Evas Software Xlib Engine Support])
|
AC_DEFINE([BUILD_ECORE_EVAS_SOFTWARE_XLIB], [1], [Evas Software Xlib Engine Support])
|
||||||
fi
|
fi
|
||||||
have_ecore_evas_software_xcb=`${PKG_CONFIG} --variable=XCB evas-software-x11`
|
have_ecore_evas_software_xcb=${have_evas_engine_software_xcb}
|
||||||
if test "x$have_ecore_evas_software_xcb" = "xstatic"; then
|
if test "x$have_ecore_evas_software_xcb" = "xstatic"; then
|
||||||
have_ecore_evas_software_xcb="yes"
|
have_ecore_evas_software_xcb="yes"
|
||||||
fi
|
fi
|
||||||
|
@ -3611,13 +3611,13 @@ ECORE_EVAS_CHECK_MODULE_FULL([opengl-x11],
|
||||||
have_ecore_evas_opengl_xlib="no"
|
have_ecore_evas_opengl_xlib="no"
|
||||||
have_ecore_evas_opengl_xcb="no"
|
have_ecore_evas_opengl_xcb="no"
|
||||||
if test "x${have_ecore_evas_opengl_x11}" = "xyes" || test "x${have_ecore_evas_opengl_x11}" = "xstatic" ; then
|
if test "x${have_ecore_evas_opengl_x11}" = "xyes" || test "x${have_ecore_evas_opengl_x11}" = "xstatic" ; then
|
||||||
have_ecore_evas_opengl_xlib=`${PKG_CONFIG} --variable=Xlib evas-opengl-x11`
|
have_ecore_evas_opengl_xlib=${have_evas_engine_gl_xlib}
|
||||||
if test "x${have_ecore_evas_opengl_xlib}" = "xyes" ; then
|
if test "x${have_ecore_evas_opengl_xlib}" = "xyes" ; then
|
||||||
AC_DEFINE([BUILD_ECORE_EVAS_OPENGL_XLIB], [1], [OpenGL Xlib rendering backend])
|
AC_DEFINE([BUILD_ECORE_EVAS_OPENGL_XLIB], [1], [OpenGL Xlib rendering backend])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# opengl does not work with xcb (yet)
|
# opengl does not work with xcb (yet)
|
||||||
have_ecore_evas_opengl_xcb=`${PKG_CONFIG} --variable=XCB evas-opengl-x11`
|
have_ecore_evas_opengl_xcb=${have_evas_engine_gl_xcb}
|
||||||
if test "x${have_ecore_evas_opengl_xcb}" = "xstatic"; then
|
if test "x${have_ecore_evas_opengl_xcb}" = "xstatic"; then
|
||||||
have_ecore_evas_opengl_xcb="yes"
|
have_ecore_evas_opengl_xcb="yes"
|
||||||
fi
|
fi
|
||||||
|
@ -4063,12 +4063,12 @@ echo " Ecore_Evas...................: $have_ecore_evas"
|
||||||
#if test "x${have_ecore_evas}" = "xyes" ; then
|
#if test "x${have_ecore_evas}" = "xyes" ; then
|
||||||
echo " Software Memory Buffer.....: $have_ecore_evas_software_buffer"
|
echo " Software Memory Buffer.....: $have_ecore_evas_software_buffer"
|
||||||
if test "x${have_ecore_evas_software_x11}" = "xyes" ; then
|
if test "x${have_ecore_evas_software_x11}" = "xyes" ; then
|
||||||
echo " Software X11...............: $have_ecore_evas_software_x11 (Xlib=${have_ecore_evas_software_xlib}) (XCB=${have_ecore_evas_software_xcb})"
|
echo " Software X11...............: $have_ecore_evas_software_x11 (Xlib: ${have_ecore_evas_software_xlib}) (XCB: ${have_ecore_evas_software_xcb})"
|
||||||
else
|
else
|
||||||
echo " Software X11...............: $have_ecore_evas_software_x11"
|
echo " Software X11...............: $have_ecore_evas_software_x11"
|
||||||
fi
|
fi
|
||||||
if test "x${have_ecore_evas_opengl_x11}" = "xyes" ; then
|
if test "x${have_ecore_evas_opengl_x11}" = "xyes" ; then
|
||||||
echo " OpenGL X11.................: $have_ecore_evas_opengl_x11 (Xlib=${have_ecore_evas_opengl_xlib}) (XCB=${have_ecore_evas_opengl_xcb})"
|
echo " OpenGL X11.................: $have_ecore_evas_opengl_x11 (Xlib: ${have_ecore_evas_opengl_xlib}) (XCB: ${have_ecore_evas_opengl_xcb})"
|
||||||
else
|
else
|
||||||
echo " OpenGL X11.................: $have_ecore_evas_opengl_x11"
|
echo " OpenGL X11.................: $have_ecore_evas_opengl_x11"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue