build again

SVN revision: 34565
This commit is contained in:
Peter Wehrfritz 2008-05-14 11:26:29 +00:00
parent 2c60edf612
commit bb1f257f5f
3 changed files with 27 additions and 31 deletions

View File

@ -89,9 +89,9 @@ if BUILD_ENGINE_SOFTWARE_XCB
psoftwarexcb = evas-software-xcb.pc psoftwarexcb = evas-software-xcb.pc
endif endif
if BUILD_ENGINE_DIRECTFB #if BUILD_ENGINE_DIRECTFB
pdirectfb = evas-directfb.pc #pdirectfb = evas-directfb.pc
endif #endif
if BUILD_ENGINE_FB if BUILD_ENGINE_FB
pfb = evas-fb.pc pfb = evas-fb.pc

View File

@ -401,30 +401,30 @@ AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, test "x$have_evas_software_xcb" = "xye
####################################### #######################################
## Check if we should build the directfb engine ## Check if we should build the directfb engine
want_evas_directfb="no"; #want_evas_directfb="no";
have_evas_directfb="no"; #have_evas_directfb="no";
#
AC_MSG_CHECKING(whether directfb backend is to be built) #AC_MSG_CHECKING(whether directfb backend is to be built)
AC_ARG_ENABLE(directfb, #AC_ARG_ENABLE(directfb,
AC_HELP_STRING([--enable-directfb], [enable the DirectFB rendering backend]), # AC_HELP_STRING([--enable-directfb], [enable the DirectFB rendering backend]),
[ want_evas_directfb=$enableval ] # [ want_evas_directfb=$enableval ]
) #)
AC_MSG_RESULT($want_evas_directfb) #AC_MSG_RESULT($want_evas_directfb)
#
if test "x$want_evas_directfb" = "xyes"; then #if test "x$want_evas_directfb" = "xyes"; then
PKG_CHECK_MODULES(DIRECTFB, directfb >= 0.9.16, # PKG_CHECK_MODULES(DIRECTFB, directfb >= 0.9.16,
[ # [
AC_DEFINE(BUILD_ENGINE_DIRECTFB, 1, [DirectFB Rendering Backend]) # AC_DEFINE(BUILD_ENGINE_DIRECTFB, 1, [DirectFB Rendering Backend])
have_evas_directfb="yes" # have_evas_directfb="yes"
], # ],
[ # [
if test "x$want_evas_directfb" = "xyes" -a "x$use_strict" = "xyes" ; then # if test "x$want_evas_directfb" = "xyes" -a "x$use_strict" = "xyes" ; then
AC_MSG_ERROR([DirectFB not found (strict dependencies checking)]) # AC_MSG_ERROR([DirectFB not found (strict dependencies checking)])
fi # fi
] # ]
) # )
fi #fi
AM_CONDITIONAL(BUILD_ENGINE_DIRECTFB, test "x$have_evas_directfb" = "xyes") #AM_CONDITIONAL(BUILD_ENGINE_DIRECTFB, test "x$have_evas_directfb" = "xyes")
####################################### #######################################
## Check if we should build the sdl engine ## Check if we should build the sdl engine
@ -1649,7 +1649,6 @@ AC_SUBST(pthread_libs)
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
evas-cairo-x11.pc evas-cairo-x11.pc
evas-directfb.pc
evas-fb.pc evas-fb.pc
evas-glitz-x11.pc evas-glitz-x11.pc
evas-opengl-glew.pc evas-opengl-glew.pc
@ -1695,7 +1694,6 @@ src/modules/engines/fb/Makefile
src/modules/engines/buffer/Makefile src/modules/engines/buffer/Makefile
src/modules/engines/software_win32_gdi/Makefile src/modules/engines/software_win32_gdi/Makefile
src/modules/engines/software_qtopia/Makefile src/modules/engines/software_qtopia/Makefile
src/modules/engines/directfb/Makefile
src/modules/engines/gl_common/Makefile src/modules/engines/gl_common/Makefile
src/modules/engines/gl_glew/Makefile src/modules/engines/gl_glew/Makefile
src/modules/engines/gl_x11/Makefile src/modules/engines/gl_x11/Makefile
@ -1750,7 +1748,6 @@ echo " Software XCB...............: $have_evas_software_xcb"
echo " Software Framebuffer.......: $have_evas_fb" echo " Software Framebuffer.......: $have_evas_fb"
echo " Software Qtopia............: $have_evas_qtopia" echo " Software Qtopia............: $have_evas_qtopia"
echo " Software Memory Buffer.....: $have_evas_buffer" echo " Software Memory Buffer.....: $have_evas_buffer"
echo " DirectFB...................: $have_evas_directfb"
echo " Software SDL...............: $have_evas_sdl (primitive: $sdl_primitive)" echo " Software SDL...............: $have_evas_sdl (primitive: $sdl_primitive)"
echo " OpenGL Glew................: $have_evas_gl_glew" echo " OpenGL Glew................: $have_evas_gl_glew"
echo " OpenGL X11.................: $have_evas_gl_x11" echo " OpenGL X11.................: $have_evas_gl_x11"

View File

@ -5,7 +5,6 @@ software_generic \
buffer \ buffer \
cairo_common \ cairo_common \
cairo_x11 \ cairo_x11 \
directfb \
fb \ fb \
gl_common \ gl_common \
gl_x11 \ gl_x11 \