move to use Ecore and Ecore_Evas.

1 files changed, 2 insertions, 162 deletions

diff --git a/configure.ac b/configure.ac
index 43b52a8..bccd4ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,86 +16,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 PKG_PROG_PKG_CONFIG
 
 
-### Additional options to configure
-
-## Simple X11 build/link
-
-## Evas engines
-
-AC_ARG_ENABLE(simple-x11,
-   [AC_HELP_STRING([--enable-simple-x11], [enable simple x11 linking])],
-   [want_evas_simple_x11=$enableval]
-)
-
-# Software X11
-have_software_xlib="no"
-have_software_xcb="no"
-EXPEDITE_CHECK_ENGINE([software-x11], [Software X11], "yes")
-
-if test "x${have_software_x11}" = "xyes" ; then
-   have_software_xlib=`${PKG_CONFIG} --variable=Xlib evas-software-x11`
-   if test "x${have_software_xlib}" = "xstatic" ; then
-      have_software_xlib="yes"
-   fi
-   if test "x${have_software_xlib}" = "xyes" ; then
-      AC_DEFINE(HAVE_EVAS_SOFTWARE_XLIB, 1, [Evas Software Xlib Engine Support])
-   fi
-   have_software_xcb=`${PKG_CONFIG} --variable=XCB evas-software-x11`
-   if test "x${have_software_xcb}" = "xstatic" ; then
-      have_software_xcb="yes"
-   fi
-   if test "x${have_software_xcb}" = "xyes" ; then
-      AC_DEFINE(HAVE_EVAS_SOFTWARE_XCB, 1, [Evas Software XCB Engine Support])
-   fi
-fi
-
-AM_CONDITIONAL([BUILD_SOFTWARE_XLIB], [test "x${have_software_xlib}" = "xyes"])
-AM_CONDITIONAL([BUILD_SOFTWARE_XCB], [test "x${have_software_xcb}" = "xyes"])
-
-# XRender X11
-EXPEDITE_CHECK_ENGINE([xrender-x11], [XRender X11], "yes")
-
-# OpenGL X11
-EXPEDITE_CHECK_ENGINE([opengl-x11], [OpenGL X11], "yes")
-
-# XRender XCB
-EXPEDITE_CHECK_ENGINE([xrender-xcb], [XRender XCB], "yes")
-
-# GDI
-EXPEDITE_CHECK_ENGINE([software-gdi], [Software GDI], "yes", [gdi_libs="-lgdi32"])
-AC_SUBST(gdi_libs)
-
-# DirectDraw
-EXPEDITE_CHECK_ENGINE([software-ddraw], [Software DirectDraw], "yes", [ddraw_libs="-lddraw -ldxguid -lgdi32"])
-AC_SUBST(ddraw_libs)
-
-# Direct3D
-EXPEDITE_CHECK_ENGINE([direct3d], [Direct3D], "yes", [d3d_libs="-ld3d9 -ld3dx9d -lgdi32"])
-AC_SUBST(d3d_libs)
-
-# PSL1GHT
-EXPEDITE_CHECK_ENGINE([psl1ght], [PSL1GHT], "yes")
-
-# GL SDL
-EXPEDITE_CHECK_ENGINE([opengl-sdl], [OpenGL SDL], "yes")
-
-# FB
-EXPEDITE_CHECK_ENGINE([fb], [Framebuffer], "yes")
-
-# DIRECTFB
-EXPEDITE_CHECK_ENGINE([directfb], [DirectFB], "yes")
-
-# GL Cocoa
-EXPEDITE_CHECK_ENGINE([opengl-cocoa], [OpenGL Cocoa], "yes", [gl_cocoa_libs="-framework Cocoa"])
-AC_SUBST(gl_cocoa_libs)
-
-# 16bit WinCE
-EXPEDITE_CHECK_ENGINE([software-16-wince], [Software 16 bits WinCE], "yes", [wince_16_libs="-laygshell"])
-AC_SUBST(wince_16_libs)
-
-# DRM
-EXPEDITE_CHECK_ENGINE([drm], [Drm], "no")
-
 ### Checks for programs
 
 AC_ISC_POSIX
@@ -128,74 +48,13 @@ case "$host_os" in
       ;;
 esac
 
-# Eina
+# EFL dependencies
 
-PKG_CHECK_MODULES([EINA], eina >= 1.7.99 eo >= 1.7.99)
+PKG_CHECK_MODULES([EFL], eina >= 1.7.99 eo >= 1.7.99 evas >= 1.7.99 eet >= 1.7.99 ecore-evas >= 1.7.99 ecore >= 1.7.99)
 
 EFL_ENABLE_EO_API_SUPPORT
 EFL_ENABLE_BETA_API_SUPPORT
 
-# Evas
-
-PKG_CHECK_MODULES([EVAS], evas >= 1.7.99 eet >= 1.7.99)
-
-# Xlib
-
-if test "x$have_software_xlib" = "xyes" -o "x$have_xrender_x11" = "xyes" -o "x$have_opengl_x11" = "xyes"; then
-   AC_PATH_XTRA
-   AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h],
-      [have_xlib="yes"],
-      [have_xlib="no"])
-   if test "x$want_evas_simple_x11" = "xyes"; then
-      x_libs="${x_libs} -lX11"
-   else
-      x_dir=${x_dir:-/usr/X11R6}
-      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11"
-   fi
-fi
-AM_CONDITIONAL(BUILD_X11, [test "x$have_xlib" = "xyes"])
-
-AC_SUBST(x_cflags)
-AC_SUBST(x_libs)
-
-# XCB
-
-if test "x$have_software_xcb" = "xyes"; then
-   PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], [have_xcb="yes"], [have_xcb="no"])
-fi
-AM_CONDITIONAL(BUILD_XCB, test "x$have_xcb" = "xyes")
-if test "x$have_xcb" = "xyes"; then
-   AC_DEFINE(BUILD_XCB, 1, [build xcb support])
-fi
-
-# SDL
-
-PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no"])
-AM_CONDITIONAL(BUILD_SDL, test "x$have_sdl" = "xyes")
-if test "x$have_sdl" = "xyes"; then
-   AC_DEFINE(BUILD_SDL, 1, [build sdl support])
-fi
-
-# PSL1GHT
-AM_CONDITIONAL(BUILD_PSL1GHT, test "x$have_psl1ght" = "xyes")
-
-# DirectFB
-
-if test "x$have_directfb" = "xyes"; then
-   PKG_CHECK_MODULES([DIRECTFB], [directfb], [have_directfb="yes"], [have_directfb="no"])
-fi
-AM_CONDITIONAL(BUILD_DIRECTFB, test "x$have_directfb" = "xyes")
-
-# Wayland
-EXPEDITE_CHECK_ENGINE([wayland-shm], [Wayland SHM], "no")
-EXPEDITE_CHECK_ENGINE([wayland-egl], [Wayland EGL], "no")
-
-have_wl="no"
-if test "x$have_wayland_shm" = "xyes" -o "x$have_wayland_egl" = "xyes"; then
-   PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client], [have_wl="yes"], [have_wl="no"])
-fi
-AM_CONDITIONAL(BUILD_WAYLAND, test "x$have_wl" = "xyes")
 
 ### Checks for header files
 
@@ -266,25 +125,6 @@ data/Makefile
 echo
 echo "  $PACKAGE $VERSION"
 echo
-echo "  Engines:"
-echo "    Software X11.................: ${have_software_x11} (Xlib: ${have_software_xlib}) (XCB: ${have_software_xcb})"
-echo "    X Render X11.................: ${have_xrender_x11}"
-echo "    Open GL X11..................: ${have_opengl_x11}"
-echo "    X Render XCB.................: ${have_xrender_xcb}"
-echo "    Software GDI.................: ${have_software_gdi}"
-echo "    Software DirectDraw..........: ${have_software_ddraw}"
-echo "    Direct3D.....................: ${have_direct3d}"
-echo "    Software SDL.................: ${have_software_sdl}"
-echo "    Open GL SDL..................: ${have_opengl_sdl}"
-echo "    Open GL Cocoa................: ${have_opengl_cocoa}"
-echo "    FB...........................: ${have_fb}"
-echo "    DirectFB.....................: ${have_directfb}"
-echo "    PSL1GHT......................: ${have_psl1ght}"
-echo "    Software WinCE 16 bits.......: ${have_software_16_wince}"
-echo "    Wayland EGL..................: ${have_wayland_egl}"
-echo "    Wayland SHM..................: ${have_wayland_shm}"
-echo "    DRM..........................: ${have_drm}"
-echo
 echo "  Installation:"
 echo "    prefix.......................: ${prefix}"
 echo