summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS5
-rw-r--r--COPYING3
-rw-r--r--Makefile.am79
-rw-r--r--configure.ac2451
-rw-r--r--licenses/COPYING.SMALL (renamed from legacy/emotion/COPYING)24
-rw-r--r--m4/ecore_check_c_extension.m4 (renamed from legacy/ecore/m4/check_x_extension.m4)6
-rw-r--r--m4/ecore_check_module.m4 (renamed from legacy/ecore/m4/ecore_check_module.m4)10
-rw-r--r--m4/efl_check_libs.m42
-rw-r--r--m4/efl_threads.m49
-rw-r--r--m4/evas_check_engine.m47
-rw-r--r--m4/evas_check_loader.m44
-rw-r--r--old/ChangeLog.escape (renamed from legacy/escape/ChangeLog)0
-rw-r--r--old/NEWS.escape1
-rw-r--r--old/README.escape (renamed from legacy/escape/README)0
-rw-r--r--pc/ecore-cocoa.pc.in (renamed from legacy/ecore/ecore-cocoa.pc.in)3
-rw-r--r--pc/ecore-con.pc.in (renamed from legacy/ecore/ecore-con.pc.in)3
-rw-r--r--pc/ecore-directfb.pc.in (renamed from legacy/ecore/ecore-directfb.pc.in)3
-rw-r--r--pc/ecore-evas.pc.in (renamed from legacy/ecore/ecore-evas.pc.in)5
-rw-r--r--pc/ecore-fb.pc.in (renamed from legacy/ecore/ecore-fb.pc.in)3
-rw-r--r--pc/ecore-file.pc.in (renamed from legacy/ecore/ecore-file.pc.in)3
-rw-r--r--pc/ecore-imf-evas.pc.in (renamed from legacy/ecore/ecore-imf-evas.pc.in)0
-rw-r--r--pc/ecore-imf.pc.in (renamed from legacy/ecore/ecore-imf.pc.in)0
-rw-r--r--pc/ecore-input-evas.pc.in (renamed from legacy/ecore/ecore-input-evas.pc.in)3
-rw-r--r--pc/ecore-input.pc.in (renamed from legacy/ecore/ecore-input.pc.in)3
-rw-r--r--pc/ecore-ipc.pc.in (renamed from legacy/ecore/ecore-ipc.pc.in)3
-rw-r--r--pc/ecore-psl1ght.pc.in (renamed from legacy/ecore/ecore-psl1ght.pc.in)4
-rw-r--r--pc/ecore-sdl.pc.in (renamed from legacy/ecore/ecore-sdl.pc.in)0
-rw-r--r--pc/ecore-wayland.pc.in (renamed from legacy/ecore/ecore-wayland.pc.in)4
-rw-r--r--pc/ecore-win32.pc.in (renamed from legacy/ecore/ecore-win32.pc.in)4
-rw-r--r--pc/ecore-wince.pc.in (renamed from legacy/ecore/ecore-wince.pc.in)4
-rw-r--r--pc/ecore-x.pc.in (renamed from legacy/ecore/ecore-x.pc.in)4
-rw-r--r--pc/ecore.pc.in (renamed from legacy/ecore/ecore.pc.in)6
-rw-r--r--pc/escape.pc.in (renamed from legacy/escape/escape.pc.in)0
-rw-r--r--po/ChangeLog0
-rw-r--r--po/LINGUAS2
-rw-r--r--po/Makevars (renamed from legacy/ecore/po/Makevars)0
-rw-r--r--po/POTFILES.in (renamed from legacy/ecore/po/POTFILES.in)0
-rw-r--r--po/cs.po (renamed from legacy/ecore/po/cs.po)78
-rw-r--r--po/de.po (renamed from legacy/ecore/po/de.po)78
-rw-r--r--po/el.po (renamed from legacy/ecore/po/el.po)114
-rw-r--r--po/es.po (renamed from legacy/ecore/po/es.po)86
-rw-r--r--po/fr.po (renamed from legacy/ecore/po/fr.po)78
-rw-r--r--po/gl.po (renamed from legacy/ecore/po/gl.po)85
-rw-r--r--po/it.po (renamed from legacy/ecore/po/it.po)78
-rw-r--r--po/ko.po (renamed from legacy/ecore/po/ko.po)78
-rw-r--r--po/nl.po (renamed from legacy/ecore/po/nl.po)78
-rw-r--r--po/pt.po (renamed from legacy/ecore/po/pt.po)78
-rw-r--r--po/sl.po (renamed from legacy/ecore/po/sl.po)78
-rw-r--r--src/Makefile.am37
-rw-r--r--src/Makefile_Ecore.am88
-rw-r--r--src/Makefile_Ecore_Cocoa.am37
-rw-r--r--src/Makefile_Ecore_Con.am70
-rw-r--r--src/Makefile_Ecore_DirectFB.am34
-rw-r--r--src/Makefile_Ecore_Evas.am160
-rw-r--r--src/Makefile_Ecore_FB.am42
-rw-r--r--src/Makefile_Ecore_File.am41
-rw-r--r--src/Makefile_Ecore_Imf.am186
-rw-r--r--src/Makefile_Ecore_Input.am70
-rw-r--r--src/Makefile_Ecore_Ipc.am37
-rw-r--r--src/Makefile_Ecore_Psl1ght.am38
-rw-r--r--src/Makefile_Ecore_SDL.am38
-rw-r--r--src/Makefile_Ecore_Wayland.am40
-rw-r--r--src/Makefile_Ecore_Win32.am51
-rw-r--r--src/Makefile_Ecore_WinCE.am41
-rw-r--r--src/Makefile_Ecore_X.am126
-rw-r--r--src/Makefile_Escape.am25
-rw-r--r--src/Makefile_Evas.am64
-rw-r--r--src/lib/ecore/Ecore.h (renamed from legacy/ecore/src/lib/ecore/Ecore.h)0
-rw-r--r--src/lib/ecore/Ecore_Getopt.h (renamed from legacy/ecore/src/lib/ecore/Ecore_Getopt.h)0
-rw-r--r--src/lib/ecore/ecore.c (renamed from legacy/ecore/src/lib/ecore/ecore.c)2
-rw-r--r--src/lib/ecore/ecore_alloc.c (renamed from legacy/ecore/src/lib/ecore/ecore_alloc.c)0
-rw-r--r--src/lib/ecore/ecore_anim.c (renamed from legacy/ecore/src/lib/ecore/ecore_anim.c)0
-rw-r--r--src/lib/ecore/ecore_app.c (renamed from legacy/ecore/src/lib/ecore/ecore_app.c)0
-rw-r--r--src/lib/ecore/ecore_events.c (renamed from legacy/ecore/src/lib/ecore/ecore_events.c)0
-rw-r--r--src/lib/ecore/ecore_exe.c (renamed from legacy/ecore/src/lib/ecore/ecore_exe.c)0
-rw-r--r--src/lib/ecore/ecore_exe_ps3.c (renamed from legacy/ecore/src/lib/ecore/ecore_exe_ps3.c)0
-rw-r--r--src/lib/ecore/ecore_exe_win32.c (renamed from legacy/ecore/src/lib/ecore/ecore_exe_win32.c)0
-rw-r--r--src/lib/ecore/ecore_exe_wince.c (renamed from legacy/ecore/src/lib/ecore/ecore_exe_wince.c)0
-rw-r--r--src/lib/ecore/ecore_getopt.c (renamed from legacy/ecore/src/lib/ecore/ecore_getopt.c)0
-rw-r--r--src/lib/ecore/ecore_glib.c (renamed from legacy/ecore/src/lib/ecore/ecore_glib.c)0
-rw-r--r--src/lib/ecore/ecore_idle_enterer.c (renamed from legacy/ecore/src/lib/ecore/ecore_idle_enterer.c)1
-rw-r--r--src/lib/ecore/ecore_idle_exiter.c (renamed from legacy/ecore/src/lib/ecore/ecore_idle_exiter.c)0
-rw-r--r--src/lib/ecore/ecore_idler.c (renamed from legacy/ecore/src/lib/ecore/ecore_idler.c)0
-rw-r--r--src/lib/ecore/ecore_job.c (renamed from legacy/ecore/src/lib/ecore/ecore_job.c)0
-rw-r--r--src/lib/ecore/ecore_main.c (renamed from legacy/ecore/src/lib/ecore/ecore_main.c)5
-rw-r--r--src/lib/ecore/ecore_pipe.c (renamed from legacy/ecore/src/lib/ecore/ecore_pipe.c)4
-rw-r--r--src/lib/ecore/ecore_poll.c (renamed from legacy/ecore/src/lib/ecore/ecore_poll.c)0
-rw-r--r--src/lib/ecore/ecore_private.h (renamed from legacy/ecore/src/lib/ecore/ecore_private.h)0
-rw-r--r--src/lib/ecore/ecore_signal.c (renamed from legacy/ecore/src/lib/ecore/ecore_signal.c)0
-rw-r--r--src/lib/ecore/ecore_thread.c (renamed from legacy/ecore/src/lib/ecore/ecore_thread.c)0
-rw-r--r--src/lib/ecore/ecore_throttle.c (renamed from legacy/ecore/src/lib/ecore/ecore_throttle.c)0
-rw-r--r--src/lib/ecore/ecore_time.c (renamed from legacy/ecore/src/lib/ecore/ecore_time.c)0
-rw-r--r--src/lib/ecore/ecore_timer.c (renamed from legacy/ecore/src/lib/ecore/ecore_timer.c)0
-rw-r--r--src/lib/ecore_cocoa/Ecore_Cocoa.h (renamed from legacy/ecore/src/lib/ecore_cocoa/Ecore_Cocoa.h)0
-rw-r--r--src/lib/ecore_cocoa/Ecore_Cocoa_Keys.h (renamed from legacy/ecore/src/lib/ecore_cocoa/Ecore_Cocoa_Keys.h)0
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa.m (renamed from legacy/ecore/src/lib/ecore_cocoa/ecore_cocoa.m)0
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa_private.h (renamed from legacy/ecore/src/lib/ecore_cocoa/ecore_cocoa_private.h)0
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa_window.m (renamed from legacy/ecore/src/lib/ecore_cocoa/ecore_cocoa_window.m)0
-rw-r--r--src/lib/ecore_con/Ecore_Con.h (renamed from legacy/ecore/src/lib/ecore_con/Ecore_Con.h)0
-rw-r--r--src/lib/ecore_con/Ecore_Con_Eet.h (renamed from legacy/ecore/src/lib/ecore_con/Ecore_Con_Eet.h)0
-rw-r--r--src/lib/ecore_con/dns.c (renamed from legacy/ecore/src/lib/ecore_con/dns.c)0
-rw-r--r--src/lib/ecore_con/dns.h (renamed from legacy/ecore/src/lib/ecore_con/dns.h)0
-rw-r--r--src/lib/ecore_con/ecore_con.c (renamed from legacy/ecore/src/lib/ecore_con/ecore_con.c)0
-rw-r--r--src/lib/ecore_con/ecore_con_alloc.c (renamed from legacy/ecore/src/lib/ecore_con/ecore_con_alloc.c)0
-rw-r--r--src/lib/ecore_con/ecore_con_ares.c (renamed from legacy/ecore/src/lib/ecore_con/ecore_con_ares.c)0
-rw-r--r--src/lib/ecore_con/ecore_con_dns.c (renamed from legacy/ecore/src/lib/ecore_con/ecore_con_dns.c)0
-rw-r--r--src/lib/ecore_con/ecore_con_eet.c (renamed from legacy/ecore/src/lib/ecore_con/ecore_con_eet.c)14
-rw-r--r--src/lib/ecore_con/ecore_con_info.c (renamed from legacy/ecore/src/lib/ecore_con/ecore_con_info.c)0
-rw-r--r--src/lib/ecore_con/ecore_con_local.c (renamed from legacy/ecore/src/lib/ecore_con/ecore_con_local.c)0
-rw-r--r--src/lib/ecore_con/ecore_con_local_win32.c (renamed from legacy/ecore/src/lib/ecore_con/ecore_con_local_win32.c)0
-rw-r--r--src/lib/ecore_con/ecore_con_private.h (renamed from legacy/ecore/src/lib/ecore_con/ecore_con_private.h)0
-rw-r--r--src/lib/ecore_con/ecore_con_socks.c (renamed from legacy/ecore/src/lib/ecore_con/ecore_con_socks.c)0
-rw-r--r--src/lib/ecore_con/ecore_con_ssl.c (renamed from legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c)0
-rw-r--r--src/lib/ecore_con/ecore_con_url.c (renamed from legacy/ecore/src/lib/ecore_con/ecore_con_url.c)0
-rw-r--r--src/lib/ecore_directfb/Ecore_DirectFB.h (renamed from legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h)0
-rw-r--r--src/lib/ecore_directfb/ecore_directfb.c (renamed from legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c)0
-rw-r--r--src/lib/ecore_directfb/ecore_directfb_keys.h (renamed from legacy/ecore/src/lib/ecore_directfb/ecore_directfb_keys.h)0
-rw-r--r--src/lib/ecore_directfb/ecore_directfb_private.h (renamed from legacy/ecore/src/lib/ecore_directfb/ecore_directfb_private.h)0
-rw-r--r--src/lib/ecore_evas/Ecore_Evas.h (renamed from legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h)0
-rw-r--r--src/lib/ecore_evas/ecore_evas.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_buffer.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_cocoa.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_cocoa.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_directfb.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_ews.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_ews.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_extn.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_extn.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_fb.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_private.h (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_psl1ght.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_psl1ght.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_sdl.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_util.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_wayland_common.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_common.c)12
-rw-r--r--src/lib/ecore_evas/ecore_evas_wayland_egl.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_wayland_shm.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_win32.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_wince.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c)0
-rw-r--r--src/lib/ecore_evas/ecore_evas_x.c (renamed from legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c)0
-rw-r--r--src/lib/ecore_fb/Ecore_Fb.h (renamed from legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h)0
-rw-r--r--src/lib/ecore_fb/ecore_fb.c (renamed from legacy/ecore/src/lib/ecore_fb/ecore_fb.c)0
-rw-r--r--src/lib/ecore_fb/ecore_fb_kbd.c (renamed from legacy/ecore/src/lib/ecore_fb/ecore_fb_kbd.c)0
-rw-r--r--src/lib/ecore_fb/ecore_fb_keytable.h (renamed from legacy/ecore/src/lib/ecore_fb/ecore_fb_keytable.h)0
-rw-r--r--src/lib/ecore_fb/ecore_fb_li.c (renamed from legacy/ecore/src/lib/ecore_fb/ecore_fb_li.c)0
-rw-r--r--src/lib/ecore_fb/ecore_fb_private.h (renamed from legacy/ecore/src/lib/ecore_fb/ecore_fb_private.h)0
-rw-r--r--src/lib/ecore_fb/ecore_fb_ps2.c (renamed from legacy/ecore/src/lib/ecore_fb/ecore_fb_ps2.c)0
-rw-r--r--src/lib/ecore_fb/ecore_fb_ts.c (renamed from legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c)0
-rw-r--r--src/lib/ecore_fb/ecore_fb_vt.c (renamed from legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c)0
-rw-r--r--src/lib/ecore_file/Ecore_File.h (renamed from legacy/ecore/src/lib/ecore_file/Ecore_File.h)0
-rw-r--r--src/lib/ecore_file/ecore_file.c (renamed from legacy/ecore/src/lib/ecore_file/ecore_file.c)0
-rw-r--r--src/lib/ecore_file/ecore_file_download.c (renamed from legacy/ecore/src/lib/ecore_file/ecore_file_download.c)0
-rw-r--r--src/lib/ecore_file/ecore_file_monitor.c (renamed from legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c)0
-rw-r--r--src/lib/ecore_file/ecore_file_monitor_inotify.c (renamed from legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c)0
-rw-r--r--src/lib/ecore_file/ecore_file_monitor_poll.c (renamed from legacy/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c)0
-rw-r--r--src/lib/ecore_file/ecore_file_monitor_win32.c (renamed from legacy/ecore/src/lib/ecore_file/ecore_file_monitor_win32.c)0
-rw-r--r--src/lib/ecore_file/ecore_file_path.c (renamed from legacy/ecore/src/lib/ecore_file/ecore_file_path.c)0
-rw-r--r--src/lib/ecore_file/ecore_file_private.h (renamed from legacy/ecore/src/lib/ecore_file/ecore_file_private.h)0
-rw-r--r--src/lib/ecore_imf/Ecore_IMF.h (renamed from legacy/ecore/src/lib/ecore_imf/Ecore_IMF.h)0
-rw-r--r--src/lib/ecore_imf/Ecore_IMF_Evas.h (renamed from legacy/ecore/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h)0
-rw-r--r--src/lib/ecore_imf/ecore_imf.c (renamed from legacy/ecore/src/lib/ecore_imf/ecore_imf.c)0
-rw-r--r--src/lib/ecore_imf/ecore_imf_context.c (renamed from legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c)0
-rw-r--r--src/lib/ecore_imf/ecore_imf_evas.c (renamed from legacy/ecore/src/lib/ecore_imf_evas/ecore_imf_evas.c)0
-rw-r--r--src/lib/ecore_imf/ecore_imf_module.c (renamed from legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c)0
-rw-r--r--src/lib/ecore_imf/ecore_imf_private.h (renamed from legacy/ecore/src/lib/ecore_imf/ecore_imf_private.h)0
-rw-r--r--src/lib/ecore_input/Ecore_Input.h (renamed from legacy/ecore/src/lib/ecore_input/Ecore_Input.h)0
-rw-r--r--src/lib/ecore_input/Ecore_Input_Evas.h (renamed from legacy/ecore/src/lib/ecore_input_evas/Ecore_Input_Evas.h)0
-rw-r--r--src/lib/ecore_input/ecore_input.c (renamed from legacy/ecore/src/lib/ecore_input/ecore_input.c)0
-rw-r--r--src/lib/ecore_input/ecore_input_compose.c (renamed from legacy/ecore/src/lib/ecore_input/ecore_input_compose.c)0
-rw-r--r--src/lib/ecore_input/ecore_input_compose.h (renamed from legacy/ecore/src/lib/ecore_input/ecore_input_compose.h)0
-rw-r--r--src/lib/ecore_input/ecore_input_evas.c (renamed from legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas.c)0
-rw-r--r--src/lib/ecore_input/ecore_input_evas_private.h (renamed from legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas_private.h)0
-rw-r--r--src/lib/ecore_input/ecore_input_private.h (renamed from legacy/ecore/src/lib/ecore_input/ecore_input_private.h)0
-rw-r--r--src/lib/ecore_ipc/Ecore_Ipc.h (renamed from legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h)0
-rw-r--r--src/lib/ecore_ipc/ecore_ipc.c (renamed from legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c)0
-rw-r--r--src/lib/ecore_ipc/ecore_ipc_private.h (renamed from legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h)0
-rw-r--r--src/lib/ecore_sdl/Ecore_Sdl.h (renamed from legacy/ecore/src/lib/ecore_sdl/Ecore_Sdl.h)0
-rw-r--r--src/lib/ecore_sdl/Ecore_Sdl_Keys.h (renamed from legacy/ecore/src/lib/ecore_sdl/Ecore_Sdl_Keys.h)0
-rw-r--r--src/lib/ecore_sdl/ecore_sdl.c (renamed from legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c)1
-rw-r--r--src/lib/ecore_sdl/ecore_sdl_private.h (renamed from legacy/ecore/src/lib/ecore_sdl/ecore_sdl_private.h)0
-rw-r--r--src/lib/ecore_wayland/Ecore_Wayland.h (renamed from legacy/ecore/src/lib/ecore_wayland/Ecore_Wayland.h)0
-rw-r--r--src/lib/ecore_wayland/ecore_wl.c (renamed from legacy/ecore/src/lib/ecore_wayland/ecore_wl.c)0
-rw-r--r--src/lib/ecore_wayland/ecore_wl_dnd.c (renamed from legacy/ecore/src/lib/ecore_wayland/ecore_wl_dnd.c)0
-rw-r--r--src/lib/ecore_wayland/ecore_wl_input.c (renamed from legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c)0
-rw-r--r--src/lib/ecore_wayland/ecore_wl_output.c (renamed from legacy/ecore/src/lib/ecore_wayland/ecore_wl_output.c)0
-rw-r--r--src/lib/ecore_wayland/ecore_wl_private.h (renamed from legacy/ecore/src/lib/ecore_wayland/ecore_wl_private.h)0
-rw-r--r--src/lib/ecore_wayland/ecore_wl_window.c (renamed from legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c)0
-rw-r--r--src/lib/ecore_win32/Ecore_Win32.h (renamed from legacy/ecore/src/lib/ecore_win32/Ecore_Win32.h)0
-rw-r--r--src/lib/ecore_win32/ecore_win32.c (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32.c)0
-rw-r--r--src/lib/ecore_win32/ecore_win32_cursor.c (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_cursor.c)0
-rwxr-xr-xsrc/lib/ecore_win32/ecore_win32_dnd.c (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd.c)0
-rw-r--r--src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp)0
-rw-r--r--src/lib/ecore_win32/ecore_win32_dnd_data_object.h (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.h)0
-rw-r--r--src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp)0
-rw-r--r--src/lib/ecore_win32/ecore_win32_dnd_drop_source.h (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.h)0
-rw-r--r--src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp)0
-rw-r--r--src/lib/ecore_win32/ecore_win32_dnd_drop_target.h (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.h)0
-rw-r--r--src/lib/ecore_win32/ecore_win32_dnd_enumformatetc.cpp (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_enumformatetc.cpp)0
-rw-r--r--src/lib/ecore_win32/ecore_win32_dnd_enumformatetc.h (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_enumformatetc.h)0
-rw-r--r--src/lib/ecore_win32/ecore_win32_event.c (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_event.c)0
-rw-r--r--src/lib/ecore_win32/ecore_win32_private.h (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_private.h)0
-rw-r--r--src/lib/ecore_win32/ecore_win32_window.c (renamed from legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c)0
-rw-r--r--src/lib/ecore_wince/Ecore_WinCE.h (renamed from legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h)0
-rw-r--r--src/lib/ecore_wince/ecore_wince.c (renamed from legacy/ecore/src/lib/ecore_wince/ecore_wince.c)0
-rw-r--r--src/lib/ecore_wince/ecore_wince_event.c (renamed from legacy/ecore/src/lib/ecore_wince/ecore_wince_event.c)0
-rw-r--r--src/lib/ecore_wince/ecore_wince_private.h (renamed from legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h)0
-rw-r--r--src/lib/ecore_wince/ecore_wince_window.c (renamed from legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c)0
-rw-r--r--src/lib/ecore_x/Ecore_X.h (renamed from legacy/ecore/src/lib/ecore_x/Ecore_X.h)0
-rw-r--r--src/lib/ecore_x/Ecore_X_Atoms.h (renamed from legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h)0
-rw-r--r--src/lib/ecore_x/Ecore_X_Cursor.h (renamed from legacy/ecore/src/lib/ecore_x/Ecore_X_Cursor.h)0
-rw-r--r--src/lib/ecore_x/ecore_x_atoms_decl.h (renamed from legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_atoms.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_atoms.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_composite.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_composite.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_cursor.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_cursor.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_damage.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_damage.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_dnd.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_dnd.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_dpms.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_dpms.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_drawable.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_drawable.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_e.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_e.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_error.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_error.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_events.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_extensions.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_extensions.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_gc.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_gc.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_gesture.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_gesture.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_icccm.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_image.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_image.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_input.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_input.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_keymap.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_keymap.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_mwm.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_mwm.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_netwm.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_netwm.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_pixmap.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_private.h (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_randr.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_randr.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_region.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_region.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_render.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_render.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_screensaver.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_screensaver.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_selection.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_selection.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_shape.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_shape.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_sync.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_sync.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_textlist.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_textlist.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_vsync.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_vsync.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_window.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_window_prop.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_window_shadow.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_shadow.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_window_shape.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_xdefaults.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_xdefaults.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_xfixes.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_xinerama.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_xinerama.c)0
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_xtest.c (renamed from legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_xtest.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_atoms.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_composite.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_cursor.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_damage.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_dnd.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_dpms.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_drawable.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_e.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_error.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_events.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_fixes.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_gc.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_gesture.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_icccm.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_image.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_mwm.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_netwm.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_pixmap.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_private.h (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_randr.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_randr.h (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.h)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_randr_11.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_randr_12.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_randr_13.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_13.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_region.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_region.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_screensaver.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_selection.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_sync.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_test.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_test.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_vsync.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_vsync.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_window.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_window_prop.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_window_shape.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_xi2.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_xi2.c)0
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_xinerama.c (renamed from legacy/ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c)0
-rw-r--r--src/lib/escape/Escape.h (renamed from legacy/escape/src/lib/Escape.h)0
-rw-r--r--src/lib/escape/escape_libgen.c (renamed from legacy/escape/src/lib/escape_libgen.c)0
-rw-r--r--src/lib/escape/escape_libgen.h (renamed from legacy/escape/src/lib/escape_libgen.h)0
-rw-r--r--src/lib/escape/escape_mman.c (renamed from legacy/escape/src/lib/escape_mman.c)0
-rw-r--r--src/lib/escape/escape_unistd.c (renamed from legacy/escape/src/lib/escape_unistd.c)0
-rw-r--r--src/lib/escape/escape_unistd.h (renamed from legacy/escape/src/lib/escape_unistd.h)0
-rw-r--r--src/lib/escape/sys/mman.h (renamed from legacy/escape/src/lib/sys/mman.h)0
-rw-r--r--src/modules/ecore/immodules/ibus/ibus_imcontext.c (renamed from legacy/ecore/src/modules/immodules/ibus/ibus_imcontext.c)22
-rw-r--r--src/modules/ecore/immodules/ibus/ibus_imcontext.h (renamed from legacy/ecore/src/modules/immodules/ibus/ibus_imcontext.h)0
-rw-r--r--src/modules/ecore/immodules/ibus/ibus_module.c (renamed from legacy/ecore/src/modules/immodules/ibus/ibus_module.c)0
-rw-r--r--src/modules/ecore/immodules/scim/scim_imcontext.cpp (renamed from legacy/ecore/src/modules/immodules/scim/scim_imcontext.cpp)0
-rw-r--r--src/modules/ecore/immodules/scim/scim_imcontext.h (renamed from legacy/ecore/src/modules/immodules/scim/scim_imcontext.h)0
-rw-r--r--src/modules/ecore/immodules/scim/scim_module.cpp (renamed from legacy/ecore/src/modules/immodules/scim/scim_module.cpp)0
-rw-r--r--src/modules/ecore/immodules/xim/ecore_imf_xim.c (renamed from legacy/ecore/src/modules/immodules/xim/ecore_imf_xim.c)24
-rw-r--r--src/utils/ecore/makekeys.c (renamed from legacy/ecore/src/util/makekeys.c)0
-rwxr-xr-xsrc/utils/ecore/mkks.sh (renamed from legacy/ecore/src/util/mkks.sh)0
299 files changed, 4195 insertions, 682 deletions
diff --git a/AUTHORS b/AUTHORS
index 17b645d..63915c7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,11 @@ Daniel Stenberg (inet_pton and inet_ntop functions)
10The MinGW and MinGW-w64 teams (POSIX printf family functions) 10The MinGW and MinGW-w64 teams (POSIX printf family functions)
11Keith Marshall (realpath on Windows XP). See http://sourceforge.net/tracker/?func=detail&atid=302435&aid=1294010&group_id=2435 11Keith Marshall (realpath on Windows XP). See http://sourceforge.net/tracker/?func=detail&atid=302435&aid=1294010&group_id=2435
12 12
13Escape
14------
15
16Youness Alaoui (KaKaRoTo)
17
13Eina 18Eina
14---- 19----
15 20
diff --git a/COPYING b/COPYING
index 4cbd1f8..32df97f 100644
--- a/COPYING
+++ b/COPYING
@@ -2,8 +2,9 @@ EFL comes with several licences. Listed are the library/probject
2name and the license file covering it. 2name and the license file covering it.
3 3
4evil: licenses/COPYING.BSD 4evil: licenses/COPYING.BSD
5escape: licenses/COPYING.GPL
5eet: licenses/COPYING.BSD 6eet: licenses/COPYING.BSD
6eina: licenses/COPYING.LGPL 7eina: licenses/COPYING.LGPL
7eo: licenses/COPYING.BSD 8eo: licenses/COPYING.BSD
8evas: licenses/COPYING.BSD 9evas: licenses/COPYING.BSD
9embryo: licenses/COPYING.BSD 10embryo: licenses/COPYING.SMALL
diff --git a/Makefile.am b/Makefile.am
index d0f7c55..b59b220 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,12 @@ ACLOCAL_AMFLAGS = -I m4
2 2
3SUBDIRS = src data doc 3SUBDIRS = src data doc
4 4
5if HAVE_PO
6
7SUBDIRS += po
8
9endif
10
5MAINTAINERCLEANFILES = \ 11MAINTAINERCLEANFILES = \
6Makefile.in \ 12Makefile.in \
7aclocal.m4 \ 13aclocal.m4 \
@@ -53,6 +59,7 @@ old/NEWS.eet \
53old/README.eet \ 59old/README.eet \
54spec/efl.spec \ 60spec/efl.spec \
55pc/evil.pc \ 61pc/evil.pc \
62pc/escape.pc \
56pc/eina.pc \ 63pc/eina.pc \
57pc/eet.pc \ 64pc/eet.pc \
58pc/eo.pc \ 65pc/eo.pc \
@@ -65,10 +72,27 @@ pc/evas-software-buffer.pc \
65pc/evas-software-x11.pc \ 72pc/evas-software-x11.pc \
66pc/evas-software-gdi.pc \ 73pc/evas-software-gdi.pc \
67pc/evas-software-ddraw.pc \ 74pc/evas-software-ddraw.pc \
68pc/evas-direct3d.pc \
69pc/evas-psl1ght.pc \ 75pc/evas-psl1ght.pc \
70pc/evas-wayland-shm.pc \ 76pc/evas-wayland-shm.pc \
71pc/evas-wayland-egl.pc \ 77pc/evas-wayland-egl.pc \
78pc/ecore.pc \
79pc/ecore-con.pc \
80pc/ecore-ipc.pc \
81pc/ecore-file.pc \
82pc/ecore-input.pc \
83pc/ecore-input-evas.pc \
84pc/ecore-cocoa.pc \
85pc/ecore-directfb.pc \
86pc/ecore-fb.pc \
87pc/ecore-psl1ght.pc \
88pc/ecore-sdl.pc \
89pc/ecore-wayland.pc \
90pc/ecore-win32.pc \
91pc/ecore-wince.pc \
92pc/ecore-x.pc \
93pc/ecore-imf.pc \
94pc/ecore-imf-evas.pc \
95pc/ecore-evas.pc \
72pc/embryo.pc 96pc/embryo.pc
73 97
74pkgconfigdir = $(libdir)/pkgconfig 98pkgconfigdir = $(libdir)/pkgconfig
@@ -78,11 +102,24 @@ if HAVE_WINDOWS
78pkgconfig_DATA += pc/evil.pc 102pkgconfig_DATA += pc/evil.pc
79endif 103endif
80 104
105if HAVE_PS3
106pkgconfig_DATA += pc/escape.pc
107endif
108
81pkgconfig_DATA += \ 109pkgconfig_DATA += \
82pc/eina.pc \ 110pc/eina.pc \
83pc/eo.pc \ 111pc/eo.pc \
84pc/eet.pc \ 112pc/eet.pc \
85pc/evas.pc \ 113pc/evas.pc \
114pc/ecore.pc \
115pc/ecore-con.pc \
116pc/ecore-ipc.pc \
117pc/ecore-file.pc \
118pc/ecore-input.pc \
119pc/ecore-input-evas.pc \
120pc/ecore-imf.pc \
121pc/ecore-imf-evas.pc \
122pc/ecore-evas.pc \
86pc/embryo.pc 123pc/embryo.pc
87 124
88if BUILD_ENGINE_SOFTWARE_X11 125if BUILD_ENGINE_SOFTWARE_X11
@@ -121,10 +158,6 @@ if BUILD_ENGINE_SOFTWARE_DDRAW
121pkgconfig_DATA += pc/evas-software-ddraw.pc 158pkgconfig_DATA += pc/evas-software-ddraw.pc
122endif 159endif
123 160
124if BUILD_ENGINE_DIRECT3D
125pkgconfig_DATA += pc/evas-direct3d.pc
126endif
127
128if BUILD_ENGINE_PSL1GHT 161if BUILD_ENGINE_PSL1GHT
129pkgconfig_DATA += pc/evas-psl1ght.pc 162pkgconfig_DATA += pc/evas-psl1ght.pc
130endif 163endif
@@ -137,6 +170,42 @@ if BUILD_ENGINE_WAYLAND_EGL
137pkgconfig_DATA += pc/evas-wayland-egl.pc 170pkgconfig_DATA += pc/evas-wayland-egl.pc
138endif 171endif
139 172
173if HAVE_ECORE_COCOA
174pkgconfig_DATA += pc/ecore-cocoa.pc
175endif
176
177if HAVE_ECORE_DIRECTFB
178pkgconfig_DATA += pc/ecore-directfb.pc
179endif
180
181if HAVE_ECORE_FB
182pkgconfig_DATA += pc/ecore-fb.pc
183endif
184
185if HAVE_PS3
186pkgconfig_DATA += pc/ecore-psl1ght.pc
187endif
188
189if HAVE_ECORE_SDL
190pkgconfig_DATA += pc/ecore-sdl.pc
191endif
192
193if HAVE_ECORE_WAYLAND
194pkgconfig_DATA += pc/ecore-wayland.pc
195endif
196
197if HAVE_WIN32
198pkgconfig_DATA += pc/ecore-win32.pc
199endif
200
201if HAVE_WINCE
202pkgconfig_DATA += pc/ecore-wince.pc
203endif
204
205if HAVE_ECORE_X
206pkgconfig_DATA += pc/ecore-x.pc
207endif
208
140 209
141.PHONY: doc benchmark examples install-examples 210.PHONY: doc benchmark examples install-examples
142 211
diff --git a/configure.ac b/configure.ac
index e2d1b85..7b035be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,8 +34,7 @@ AH_BOTTOM([
34#endif /* EFL_CONFIG_H__ */ 34#endif /* EFL_CONFIG_H__ */
35]) 35])
36 36
37AC_GNU_SOURCE 37AC_USE_SYSTEM_EXTENSIONS
38AC_SYS_LARGEFILE
39 38
40AM_INIT_AUTOMAKE([1.6 dist-bzip2]) 39AM_INIT_AUTOMAKE([1.6 dist-bzip2])
41m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 40m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -76,7 +75,7 @@ esac
76# TODO: add some build "profile" (server, full, etc...) 75# TODO: add some build "profile" (server, full, etc...)
77 76
78AC_ARG_ENABLE([coverage], 77AC_ARG_ENABLE([coverage],
79 [AC_HELP_STRING([--enable-coverage], [enable unit testing coverage. @<:@default==disabled@:>@])], 78 [AC_HELP_STRING([--enable-coverage], [enable unit testing coverage. @<:@default=disabled@:>@])],
80 [ 79 [
81 if test "x${enableval}" = "xyes" ; then 80 if test "x${enableval}" = "xyes" ; then
82 want_coverage="yes" 81 want_coverage="yes"
@@ -94,7 +93,21 @@ requirements_libs_eina=""
94requirements_libs_eo="" 93requirements_libs_eo=""
95requirements_libs_eet="" 94requirements_libs_eet=""
96requirements_libs_evas="" 95requirements_libs_evas=""
97#requirements_libs_ecore="" 96requirements_libs_ecore=""
97requirements_libs_ecore_con=""
98requirements_libs_ecore_ipc=""
99requirements_libs_ecore_file=""
100requirements_libs_ecore_input=""
101requirements_libs_ecore_cocoa=""
102requirements_libs_ecore_directfb=""
103requirements_libs_ecore_fb=""
104requirements_libs_ecore_psl1ght=""
105requirements_libs_ecore_sdl=""
106requirements_libs_ecore_wayland=""
107requirements_libs_ecore_win32=""
108requirements_libs_ecore_wince=""
109requirements_libs_ecore_x=""
110requirements_libs_ecore_evas=""
98requirements_libs_embryo="" 111requirements_libs_embryo=""
99#requirements_libs_eio="" 112#requirements_libs_eio=""
100#requirements_libs_edje="" 113#requirements_libs_edje=""
@@ -105,27 +118,25 @@ requirements_libs_embryo=""
105#requirements_libs_ethumb="" 118#requirements_libs_ethumb=""
106#requirements_libs_elementary="" 119#requirements_libs_elementary=""
107 120
108requirements_libs_deps_evil=""
109requirements_libs_deps_eina=""
110requirements_libs_deps_eo=""
111requirements_libs_deps_eet=""
112requirements_libs_deps_evas=""
113#requirements_libs_deps_ecore=""
114requirements_libs_deps_embryo=""
115#requirements_libs_deps_eio=""
116#requirements_libs_deps_edje=""
117#requirements_libs_deps_efreet=""
118#requirements_libs_deps_e_dbus=""
119#requirements_libs_deps_eeze=""
120#requirements_libs_deps_emotion=""
121#requirements_libs_deps_ethumb=""
122#requirements_libs_deps_elementary=""
123
124requirements_pc_eina="" 121requirements_pc_eina=""
125requirements_pc_eo="" 122requirements_pc_eo=""
126requirements_pc_eet="" 123requirements_pc_eet=""
127requirements_pc_evas="" 124requirements_pc_evas=""
128#requirements_pc_ecore="" 125requirements_pc_ecore=""
126requirements_pc_ecore_con=""
127requirements_pc_ecore_ipc=""
128requirements_pc_ecore_file=""
129requirements_pc_ecore_input=""
130requirements_pc_ecore_cocoa=""
131requirements_pc_ecore_directfb=""
132requirements_pc_ecore_fb=""
133requirements_pc_ecore_psl1ght=""
134requirements_pc_ecore_sdl=""
135requirements_pc_ecore_wayland=""
136requirements_pc_ecore_win32=""
137requirements_pc_ecore_wince=""
138requirements_pc_ecore_x=""
139requirements_pc_ecore_evas=""
129requirements_pc_embryo="" 140requirements_pc_embryo=""
130#requirements_pc_eio="" 141#requirements_pc_eio=""
131#requirements_pc_edje="" 142#requirements_pc_edje=""
@@ -140,7 +151,12 @@ requirements_pc_deps_eina=""
140requirements_pc_deps_eo="" 151requirements_pc_deps_eo=""
141requirements_pc_deps_eet="" 152requirements_pc_deps_eet=""
142requirements_pc_deps_evas="" 153requirements_pc_deps_evas=""
143#requirements_pc_deps_ecore="" 154requirements_pc_deps_ecore=""
155requirements_pc_deps_ecore_con=""
156requirements_pc_deps_ecore_fb=""
157requirements_pc_deps_ecore_sdl=""
158requirements_pc_deps_ecore_wayland=""
159requirements_pc_deps_ecore_evas=""
144requirements_pc_deps_embryo="" 160requirements_pc_deps_embryo=""
145#requirements_pc_deps_eio="" 161#requirements_pc_deps_eio=""
146#requirements_pc_deps_edje="" 162#requirements_pc_deps_edje=""
@@ -156,7 +172,21 @@ AC_SUBST([requirements_libs_eina])
156AC_SUBST([requirements_libs_eo]) 172AC_SUBST([requirements_libs_eo])
157AC_SUBST([requirements_libs_eet]) 173AC_SUBST([requirements_libs_eet])
158AC_SUBST([requirements_libs_evas]) 174AC_SUBST([requirements_libs_evas])
159#AC_SUBST([requirements_libs_ecore]) 175AC_SUBST([requirements_libs_ecore])
176AC_SUBST([requirements_libs_ecore_con])
177AC_SUBST([requirements_libs_ecore_ipc])
178AC_SUBST([requirements_libs_ecore_file])
179AC_SUBST([requirements_libs_ecore_input])
180AC_SUBST([requirements_libs_ecore_cocoa])
181AC_SUBST([requirements_libs_ecore_directfb])
182AC_SUBST([requirements_libs_ecore_fb])
183AC_SUBST([requirements_libs_ecore_psl1ght])
184AC_SUBST([requirements_libs_ecore_sdl])
185AC_SUBST([requirements_libs_ecore_wayland])
186AC_SUBST([requirements_libs_ecore_win32])
187AC_SUBST([requirements_libs_ecore_wince])
188AC_SUBST([requirements_libs_ecore_x])
189AC_SUBST([requirements_libs_ecore_evas])
160AC_SUBST([requirements_libs_embryo]) 190AC_SUBST([requirements_libs_embryo])
161#AC_SUBST([requirements_libs_eio]) 191#AC_SUBST([requirements_libs_eio])
162#AC_SUBST([requirements_libs_edje]) 192#AC_SUBST([requirements_libs_edje])
@@ -171,7 +201,21 @@ AC_SUBST([requirements_pc_eina])
171AC_SUBST([requirements_pc_eo]) 201AC_SUBST([requirements_pc_eo])
172AC_SUBST([requirements_pc_eet]) 202AC_SUBST([requirements_pc_eet])
173AC_SUBST([requirements_pc_evas]) 203AC_SUBST([requirements_pc_evas])
174#AC_SUBST([requirements_pc_ecore]) 204AC_SUBST([requirements_pc_ecore])
205AC_SUBST([requirements_pc_ecore_con])
206AC_SUBST([requirements_pc_ecore_ipc])
207AC_SUBST([requirements_pc_ecore_file])
208AC_SUBST([requirements_pc_ecore_input])
209AC_SUBST([requirements_pc_ecore_cocoa])
210AC_SUBST([requirements_pc_ecore_directfb])
211AC_SUBST([requirements_pc_ecore_fb])
212AC_SUBST([requirements_pc_ecore_psl1ght])
213AC_SUBST([requirements_pc_ecore_sdl])
214AC_SUBST([requirements_pc_ecore_wayland])
215AC_SUBST([requirements_pc_ecore_win32])
216AC_SUBST([requirements_pc_ecore_wince])
217AC_SUBST([requirements_pc_ecore_x])
218AC_SUBST([requirements_pc_ecore_evas])
175AC_SUBST([requirements_pc_embryo]) 219AC_SUBST([requirements_pc_embryo])
176#AC_SUBST([requirements_pc_eio]) 220#AC_SUBST([requirements_pc_eio])
177#AC_SUBST([requirements_pc_edje]) 221#AC_SUBST([requirements_pc_edje])
@@ -189,6 +233,7 @@ AC_CANONICAL_HOST
189have_wince="no" 233have_wince="no"
190have_win32="no" 234have_win32="no"
191have_windows="no" 235have_windows="no"
236have_ps3="no"
192case "$host_os" in 237case "$host_os" in
193 cegcc*) 238 cegcc*)
194 AC_MSG_ERROR([ceGCC compiler is not supported anymore. Exiting...]) 239 AC_MSG_ERROR([ceGCC compiler is not supported anymore. Exiting...])
@@ -221,6 +266,12 @@ case "$host_os" in
221 ;; 266 ;;
222esac 267esac
223 268
269case "$host_vendor" in
270 ps3*)
271 have_ps3="yes"
272 ;;
273esac
274
224AC_SUBST([MODULE_ARCH]) 275AC_SUBST([MODULE_ARCH])
225AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"]) 276AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"])
226AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects]) 277AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects])
@@ -229,6 +280,7 @@ AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared ob
229AM_CONDITIONAL([HAVE_WINCE], [test "x${have_wince}" = "xyes"]) 280AM_CONDITIONAL([HAVE_WINCE], [test "x${have_wince}" = "xyes"])
230AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"]) 281AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"])
231AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"]) 282AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
283AM_CONDITIONAL([HAVE_PS3], [test "x${have_ps3}" = "xyes"])
232 284
233 285
234#### Checks for programs 286#### Checks for programs
@@ -238,14 +290,32 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
238if test "x${have_windows}" = "xyes" ; then 290if test "x${have_windows}" = "xyes" ; then
239 lt_cv_deplibs_check_method='pass_all' 291 lt_cv_deplibs_check_method='pass_all'
240fi 292fi
241AC_LIBTOOL_WIN32_DLL 293LT_INIT([win32-dll])
242define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
243AC_PROG_LIBTOOL
244version_info="lt_cur:lt_rev:lt_age" 294version_info="lt_cur:lt_rev:lt_age"
245AC_SUBST([version_info]) 295AC_SUBST([version_info])
246release_info="v_rel" 296release_info="v_rel"
247AC_SUBST([release_info]) 297AC_SUBST([release_info])
248 298
299### gettext
300
301AM_GNU_GETTEXT_VERSION([0.17])
302
303m4_ifdef([AM_GNU_GETTEXT], [
304AM_GNU_GETTEXT([external])
305po_makefile_in=po/Makefile.in
306have_po="yes"
307],
308[
309have_po="no"
310])
311AC_SUBST([LTLIBINTL])
312
313if test "x${POSUB}" = "x" ; then
314 have_po="no"
315fi
316
317AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
318
249### compilers 319### compilers
250 320
251# rw_PROG_OBJC_WORKS 321# rw_PROG_OBJC_WORKS
@@ -277,10 +347,22 @@ rw_PROG_OBJC_WORKS
277AM_PROG_AS 347AM_PROG_AS
278AC_PROG_CXX 348AC_PROG_CXX
279AC_LANG(C) 349AC_LANG(C)
280AC_PROG_CPP 350AC_PROG_CC_C99
281AC_PROG_CC
282AM_PROG_CC_C_O 351AM_PROG_CC_C_O
283 352
353if test "x${ac_cv_prog_cc_c99}" = "xno" ; then
354 AC_MSG_ERROR([ecore requires a c99-capable compiler])
355fi
356
357have_gnu_objc=${ac_cv_objc_compiler_gnu}
358
359#echo $ac_cv_prog_CXX
360#if test "x${ac_cv_prog_CXX}" = "x" ; then
361# AC_MSG_ERROR([C++ compiler needed. Exiting...])
362#fi
363
364AC_SYS_LARGEFILE
365
284# pkg-config 366# pkg-config
285 367
286PKG_PROG_PKG_CONFIG 368PKG_PROG_PKG_CONFIG
@@ -337,6 +419,7 @@ AC_HEADER_TIME
337 419
338AC_CHECK_HEADERS([ \ 420AC_CHECK_HEADERS([ \
339execinfo.h \ 421execinfo.h \
422errno.h \
340inttypes.h \ 423inttypes.h \
341libgen.h \ 424libgen.h \
342mcheck.h \ 425mcheck.h \
@@ -465,8 +548,6 @@ AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed])
465 548
466### Checks for header files 549### Checks for header files
467 550
468AC_CHECK_HEADERS([errno.h])
469
470### Checks for types 551### Checks for types
471 552
472### Checks for structures 553### Checks for structures
@@ -497,6 +578,42 @@ fi
497#### End of Evil 578#### End of Evil
498 579
499 580
581#### Escape
582
583if test "x${have_ps3}" = "xyes" ; then
584
585AC_MSG_NOTICE([Escape checks])
586
587### Additional options to configure
588
589### Default values
590
591### Checks for programs
592
593### Checks for libraries
594
595ESCAPE_LIBS="-llv2"
596requirements_libs_escape="${ESCAPE_LIBS}"
597
598AC_SUBST([ESCAPE_LIBS])
599
600### Checks for header files
601
602### Checks for types
603
604### Checks for structures
605
606### Checks for compiler characteristics
607
608### Checks for linker characteristics
609
610### Checks for library functions
611
612fi
613
614#### End of Evil
615
616
500#### Eina 617#### Eina
501 618
502AC_MSG_NOTICE([Eina checks]) 619AC_MSG_NOTICE([Eina checks])
@@ -563,17 +680,15 @@ esac
563# Escape library for compilation on Playstation 3 680# Escape library for compilation on Playstation 3
564 681
565case "$host_vendor" in 682case "$host_vendor" in
566 ps3*) 683 ps3*)
567# TODO: add back whenever escape is merged into efl single tree 684 AC_DEFINE([HAVE_ESCAPE], [1], [Set to 1 if Escape package is installed])
568# PKG_CHECK_EXISTS([escape]) 685 requirements_pc_eina="${requirements_pc_eina} escape >= ${PACKAGE_VERSION}"
569# AC_DEFINE([HAVE_ESCAPE], [1], [Set to 1 if Escape package is installed])
570# requirements_pc_eina="${requirements_pc_eina} escape"
571 ;; 686 ;;
572esac 687esac
573 688
574# Exotic library for compilation on Coyote 689# Exotic library for compilation on Coyote
575 690
576# TODO: add back whenever escape is merged into efl single tree 691# TODO: add back whenever exotic is merged into efl single tree
577#PKG_CHECK_EXISTS([exotic], 692#PKG_CHECK_EXISTS([exotic],
578# [ 693# [
579# enable_exotic="yes" 694# enable_exotic="yes"
@@ -745,7 +860,6 @@ case "$build_crypto" in
745 AC_PATH_GENERIC([libgcrypt], [], [:], 860 AC_PATH_GENERIC([libgcrypt], [], [:],
746 [AC_MSG_ERROR([libgcrypt required but not found])]) 861 [AC_MSG_ERROR([libgcrypt required but not found])])
747 requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}" 862 requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}"
748 requirements_libs_deps_eet="${LIBGCRYPT_LIBS} ${requirements_libs_deps_eet}"
749 863
750 # TODO: do we need this? can't we just bump required version? 864 # TODO: do we need this? can't we just bump required version?
751 # Specific GNUTLS improvement 865 # Specific GNUTLS improvement
@@ -782,10 +896,12 @@ case "$build_crypto" in
782 ;; 896 ;;
783 897
784 openssl) 898 openssl)
785 PKG_CHECK_MODULES([OPENSSL], [openssl]) 899 PKG_CHECK_EXISTS([openssl],
786 AC_DEFINE([HAVE_OPENSSL], [1], [Have Openssl support]) 900 [
787 requirements_pc_eet="openssl ${requirements_pc_eet}" 901 AC_DEFINE([HAVE_OPENSSL], [1], [Have Openssl support])
788 requirements_pc_deps_eet="openssl ${requirements_pc_deps_eet}" 902 requirements_pc_eet="openssl ${requirements_pc_eet}"
903 requirements_pc_deps_eet="openssl ${requirements_pc_deps_eet}"
904 ])
789 ;; 905 ;;
790esac 906esac
791 907
@@ -816,15 +932,13 @@ PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}])
816case "$host_os" in 932case "$host_os" in
817 mingw32ce*) 933 mingw32ce*)
818 requirements_libs_eet="${requirements_libs_eet} -lws2" 934 requirements_libs_eet="${requirements_libs_eet} -lws2"
819 requirements_libs_deps_eet="${requirements_libs_deps_eet} -lws2"
820 ;; 935 ;;
821 mingw*) 936 mingw*)
822 requirements_libs_eet="${requirements_libs_eet} -lws2_32" 937 requirements_libs_eet="${requirements_libs_eet} -lws2_32"
823 requirements_libs_deps_eet="${requirements_libs_deps_eet} -lws2_32"
824 ;; 938 ;;
825esac 939esac
826 940
827EET_LIBS="${EET_LIBS} ${requirements_libs_deps_eet}" 941EET_LIBS="${EET_LIBS} ${requirements_libs_eet}"
828 942
829### Checks for header files 943### Checks for header files
830 944
@@ -905,7 +1019,7 @@ AC_MSG_NOTICE([Evas checks])
905# a requirement is selected, but not met. 1019# a requirement is selected, but not met.
906use_strict="no" 1020use_strict="no"
907AC_ARG_ENABLE([strict], 1021AC_ARG_ENABLE([strict],
908 [AC_HELP_STRING([--enable-strict], [enable strict checking mode. @<:@default==disabled@:>@])], 1022 [AC_HELP_STRING([--enable-strict], [enable strict checking mode. @<:@default=disabled@:>@])],
909 [use_strict="yes"], 1023 [use_strict="yes"],
910 [use_strict="no"]) 1024 [use_strict="no"])
911 1025
@@ -1204,7 +1318,6 @@ want_evas_engine_gl_xlib="no"
1204want_evas_engine_gl_xcb="no" 1318want_evas_engine_gl_xcb="no"
1205want_evas_engine_gl_sdl="no" 1319want_evas_engine_gl_sdl="no"
1206want_evas_engine_gl_cocoa="no" 1320want_evas_engine_gl_cocoa="no"
1207want_evas_engine_direct3d="no"
1208want_evas_engine_fb="no" 1321want_evas_engine_fb="no"
1209want_evas_engine_directfb="no" 1322want_evas_engine_directfb="no"
1210want_evas_engine_psl1ght="no" 1323want_evas_engine_psl1ght="no"
@@ -1255,7 +1368,7 @@ case "$host_os" in
1255esac 1368esac
1256 1369
1257EFL_CHECK_FUNC([DLSYM], [dlsym]) 1370EFL_CHECK_FUNC([DLSYM], [dlsym])
1258requirements_libs_deps_evas="${requirements_libs_deps_evas} ${DLSYM_LIBS}" 1371requirements_libs_evas="${requirements_libs_evas} ${DLSYM_LIBS}"
1259 1372
1260if test "x${efl_func_dlsym}" = "xno" ; then 1373if test "x${efl_func_dlsym}" = "xno" ; then
1261 want_evas_engine_gl_xlib="no" 1374 want_evas_engine_gl_xlib="no"
@@ -1385,7 +1498,6 @@ fi
1385## Engines 1498## Engines
1386 1499
1387EVAS_CHECK_ENGINE([buffer], [${want_evas_engine_buffer}], [yes], [Buffer]) 1500EVAS_CHECK_ENGINE([buffer], [${want_evas_engine_buffer}], [yes], [Buffer])
1388EVAS_CHECK_ENGINE([direct3d], [${want_evas_engine_direct3d}], [no], [Direct3D])
1389EVAS_CHECK_ENGINE([directfb], [${want_evas_engine_directfb}], [no], [DirectFB]) 1501EVAS_CHECK_ENGINE([directfb], [${want_evas_engine_directfb}], [no], [DirectFB])
1390EVAS_CHECK_ENGINE([fb], [${want_evas_engine_fb}], [no], [Framebuffer]) 1502EVAS_CHECK_ENGINE([fb], [${want_evas_engine_fb}], [no], [Framebuffer])
1391EVAS_CHECK_ENGINE([gl-cocoa], [${want_evas_engine_gl_cocoa}], [no], [OpenGL Cocoa]) 1503EVAS_CHECK_ENGINE([gl-cocoa], [${want_evas_engine_gl_cocoa}], [no], [OpenGL Cocoa])
@@ -1606,7 +1718,7 @@ AM_CONDITIONAL([BUILD_SAVER_JPEG], [test "x${have_evas_image_saver_jpeg}" = "xye
1606 1718
1607PKG_CHECK_MODULES([EVAS], [${requirements_pc_deps_evas}]) 1719PKG_CHECK_MODULES([EVAS], [${requirements_pc_deps_evas}])
1608 1720
1609EVAS_LIBS="${EVAS_LIBS} ${requirements_libs_deps_evas}" 1721EVAS_LIBS="${EVAS_LIBS} ${requirements_libs_evas}"
1610 1722
1611### Checks for header files 1723### Checks for header files
1612 1724
@@ -1854,6 +1966,2094 @@ fi
1854#### End of Embryo 1966#### End of Embryo
1855 1967
1856 1968
1969#### Ecore
1970
1971AC_MSG_NOTICE([Ecore checks])
1972
1973### Additional options to configure
1974
1975# glib
1976
1977AC_ARG_WITH([glib],
1978 [AC_HELP_STRING([--with-glib=yes|no|always],
1979 [add glib support. @<:@default=enabled@:>@])],
1980 [
1981 if test "x${withval}" = "xyes" ; then
1982 with_glib="yes"
1983 else
1984 if test "x${withval}" = "xalways" ; then
1985 with_glib="always"
1986 else
1987 with_glib="no"
1988 fi
1989 fi
1990 ],
1991 [with_glib="yes"])
1992
1993AC_ARG_ENABLE([g-main-loop],
1994 [AC_HELP_STRING([--enable-g-main-loop],
1995 [enable ecore_main_loop based on g_main_loop. @<:@default=disabled@:>@])],
1996 [
1997 if test "x${enableval}" = "xyes" ; then
1998 want_g_main_loop="yes"
1999 else
2000 want_g_main_loop="no"
2001 fi
2002 ],
2003 [want_g_main_loop="no"])
2004
2005# thread safety
2006
2007AC_ARG_ENABLE([thread-safety],
2008 [AC_HELP_STRING([--enable-thread-safety],
2009 [enable thread safety. @<:@default=disabled@:>@])],
2010 [
2011 if test "x${enableval}" = "xyes" ; then
2012 want_thread_safety="yes"
2013 else
2014 want_thread_safety="no"
2015 fi
2016 ],
2017 [want_thread_safety="no"])
2018
2019# epoll
2020
2021AC_ARG_ENABLE([epoll],
2022 [AC_HELP_STRING([--disable-epoll],
2023 [disable epoll support. @<:@default=enabled@:>@])],
2024 [
2025 if test "x${enableval}" = "xyes" ; then
2026 want_epoll="yes"
2027 else
2028 want_epoll="no"
2029 fi
2030 ],
2031 [want_epoll="yes"])
2032
2033### Default values
2034
2035case "$host_os" in
2036 mingw32*)
2037 with_glib="no"
2038 ;;
2039esac
2040
2041want_glib="no"
2042if test "x${with_glib}" = "xyes" || test "x${with_glib}" = "xalways" ; then
2043 want_glib="yes"
2044fi
2045
2046if test "x${want_thread_safety}" = "xyes" ; then
2047 AC_DEFINE([HAVE_THREAD_SAFETY], [1], [Define to enable thread safety])
2048fi
2049
2050want_ecore_timer_dump="no"
2051if test "x${build_profile}" = "xdebug" && test "x${ac_cv_func_backtrace}" = "xyes"; then
2052 want_ecore_timer_dump="yes"
2053 AC_DEFINE([WANT_ECORE_TIMER_DUMP], [1], [Want Ecore_Timer dump infrastructure])
2054fi
2055
2056### Checks for programs
2057
2058### Checks for libraries
2059
2060## Compatibility layers
2061
2062# Evil library for compilation on Windows
2063
2064if test "x${have_windows}" = "xyes" ; then
2065 requirements_pc_ecore="${requirements_pc_ecore} evil >= ${PACKAGE_VERSION}"
2066fi
2067
2068# Escape library for compilation on PS3
2069
2070if test "x${have_ps3}" = "xyes" ; then
2071 requirements_pc_ecore="${requirements_pc_ecore} escape >= ${PACKAGE_VERSION}"
2072fi
2073
2074# Eina, Eo libraries
2075
2076requirements_pc_ecore="eo >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore}"
2077
2078# glib
2079
2080have_glib="no"
2081if test "x${want_glib}" = "xyes" ; then
2082 PKG_CHECK_EXISTS([glib-2.0], [have_glib="yes"], [have_glib="no"])
2083fi
2084
2085if test "x${want_glib}" = "xyes" && test "x${have_glib}" = "xno"; then
2086 AC_MSG_ERROR([GLib support requested, but no GLib found by pkg-config.])
2087elif test "x${have_glib}" = "xyes" ; then
2088 AC_DEFINE([HAVE_GLIB], [1], [Have GLib])
2089 requirements_pc_ecore="glib-2.0 ${requirements_pc_ecore}"
2090 requirements_pc_deps_ecore="glib-2.0 ${requirements_pc_deps_ecore}"
2091fi
2092
2093if test "x${have_glib}" = "xno"; then
2094 want_g_main_loop="no"
2095fi
2096
2097if test "x${with_glib}" = "xalways" && test "x${want_g_main_loop}" = "xyes"; then
2098 AC_MSG_ERROR([--with-glib set to always and --enable-glib-main-loop are mutually exclusive])
2099fi
2100
2101want_glib_integration_always=no
2102if test "x${with_glib}" = "xalways" ; then
2103 want_glib_integration_always="yes"
2104 AC_DEFINE([GLIB_INTEGRATION_ALWAYS], [1], [Always integrate glib if support compiled])
2105fi
2106
2107if test "x${want_g_main_loop}" = "xyes" ; then
2108 AC_DEFINE([USE_G_MAIN_LOOP], [1], [Use g_main_loop in ecore])
2109fi
2110
2111if ! test "x${requirements_pc_deps_ecore}" = "x" ; then
2112 PKG_CHECK_MODULES([ECORE], [${requirements_pc_deps_ecore}])
2113fi
2114
2115case "$host_os" in
2116 mingw32ce*)
2117 requirements_libs_ecore="${requirements_libs_ecore} -lws2"
2118 ;;
2119 mingw*)
2120 requirements_libs_ecore="${requirements_libs_ecore} -lws2_32"
2121 ;;
2122esac
2123
2124### Checks for header files
2125
2126AC_HEADER_SYS_WAIT
2127
2128AC_CHECK_HEADERS([ \
2129features.h \
2130langinfo.h \
2131locale.h \
2132signal.h \
2133sys/time.h \
2134sys/prctl.h \
2135sys/resource.h \
2136sys/select.h \
2137sys/timerfd.h \
2138])
2139
2140if test "x${want_epoll}" = "xyes" ; then
2141 AC_CHECK_HEADERS([sys/epoll.h])
2142fi
2143
2144### Checks for types
2145
2146### Checks for structures
2147
2148### Checks for compiler characteristics
2149
2150### Checks for linker characteristics
2151
2152### Checks for library functions
2153
2154## ecore
2155
2156# isfinite
2157
2158AC_COMPILE_IFELSE(
2159 [AC_LANG_PROGRAM(
2160 [[
2161#include <math.h>
2162 ]],
2163 [[
2164int i = isfinite(0);
2165 ]])],
2166 [
2167 AC_DEFINE(HAVE_ISFINITE, 1, [Define to 1 if you have `isfinite', as a function or macro.])
2168 have_isfinite="yes"
2169 ],
2170 [have_isfinite="no"])
2171
2172AC_MSG_CHECKING([for isfinite])
2173AC_MSG_RESULT([${have_isfinite}])
2174
2175# mallinfo, timerfd_create, clock_gettime
2176
2177AC_CHECK_FUNCS_ONCE([mallinfo timerfd_create clock_gettime])
2178
2179if ! test "x${ac_cv_func_clock_gettime}" = "xyes" ; then
2180 AC_CHECK_LIB([rt], [clock_gettime],
2181 [
2182 requirements_libs_ecore="${requirements_libs_ecore} -lrt"
2183 AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [Have clock_gettime()])
2184 ])
2185fi
2186
2187ECORE_LIBS="${ECORE_LIBS} ${LTLIBINTL} ${requirements_libs_ecore}"
2188
2189### Check availability
2190
2191#### End of Ecore
2192
2193
2194#### Ecore_Con
2195
2196AC_MSG_NOTICE([Ecore_Con checks])
2197
2198### Additional options to configure
2199
2200AC_ARG_ENABLE([ipv6],
2201 [AC_HELP_STRING([--disable-ipv6],
2202 [disable ipv6 functionality @<:@default=detect@:>@])],
2203 [
2204 if test "x${enableval}" = "xyes" ; then
2205 want_ipv6="yes"
2206 else
2207 want_ipv6="no"
2208 fi],
2209 [want_ipv6="auto"])
2210
2211AC_ARG_ENABLE([curl],
2212 [AC_HELP_STRING([--disable-curl], [disable curl support. @<:@default=enabled@:>@])],
2213 [
2214 if test "x${enableval}" = "xyes" ; then
2215 want_curl="yes"
2216 else
2217 want_curl="no"
2218 fi
2219 ],
2220 [want_curl="yes"])
2221
2222AC_ARG_WITH([tls],
2223 [AC_HELP_STRING([--with-tls=TLS],
2224 [select Transport Layer Security, one of: gnutls, openssl, none.
2225 @<:@default=gnutls@:>@])],
2226 [with_tls=${withval}],
2227 [with_tls="gnutls"])
2228
2229case "${with_tls}" in
2230 gnutls|openssl|none)
2231 ;;
2232 *)
2233 AC_MSG_ERROR([Unknown Transport Layer Security --with-tls=${with_tls}])
2234 ;;
2235esac
2236
2237AC_ARG_ENABLE([local-sockets],
2238 [AC_HELP_STRING([--disable-local-sockets], [disable local sockets.])],
2239 [
2240 if test "x${enableval}" = "xyes" ; then
2241 want_ecore_con_local_sockets="yes"
2242 else
2243 want_ecore_con_local_sockets="no"
2244 fi
2245 ],
2246 [want_ecore_con_local_sockets="yes"])
2247
2248AC_ARG_ENABLE([abstract-sockets],
2249 [AC_HELP_STRING([--disable-abstract-sockets], [disable abstract sockets.])],
2250 [
2251 if test "x${enableval}" = "xyes" ; then
2252 want_ecore_con_abstract_sockets="yes"
2253 else
2254 want_ecore_con_abstract_sockets="no"
2255 fi
2256 ],
2257 [want_ecore_con_abstract_sockets="yes"])
2258
2259### Default values
2260
2261
2262case "$host_os" in
2263 mingw32ce*)
2264 with_tls="none"
2265 want_curl="no"
2266 want_cares="no"
2267 want_ecore_con_local_sockets="no"
2268 want_ecore_con_abstract_sockets="no"
2269 ;;
2270 mingw*)
2271 want_cares="yes"
2272 want_ecore_con_abstract_sockets="no"
2273 ;;
2274 darwin*)
2275 want_ecore_con_abstract_sockets="no"
2276 ;;
2277 *)
2278 want_cares="no"
2279 ;;
2280esac
2281
2282case "$host_vendor" in
2283 ps3*)
2284 want_ecore_con_local_sockets="no"
2285 ;;
2286esac
2287
2288if test "x${want_ecore_con_local_sockets}" = "xyes" ; then
2289 AC_DEFINE([HAVE_LOCAL_SOCKETS], [1], [Have local sockets support])
2290fi
2291
2292if test "x${want_ecore_con_abstract_sockets}" = "xyes" ; then
2293 AC_DEFINE([HAVE_ABSTRACT_SOCKETS], [1], [Have abstract sockets namespace])
2294fi
2295
2296### Checks for programs
2297
2298have_gnutls="no"
2299if test "x${with_tls}" = "xgnutls" ; then
2300 AC_PATH_GENERIC([libgcrypt], [], [have_gnutls="yes"], [have_gnutls="no"])
2301fi
2302
2303### Checks for libraries
2304
2305# Evil library for compilation on Windows
2306case "$host_os" in
2307 mingw*)
2308 requirements_pc_ecore_con="evil >= ${PACKAGE_VERSION} ${requirements_pc_ecore_con}"
2309 ;;
2310esac
2311
2312# Eina, Eo, Eet, Ecore
2313
2314requirements_pc_ecore_con="ecore >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eo >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_con}"
2315
2316# gnuTLS
2317
2318if test "x${have_gnutls}" = "xyes" ; then
2319 PKG_CHECK_EXISTS([gnutls >= 2.10.2],
2320 [
2321 have_gnutls="yes"
2322 AC_DEFINE([USE_GNUTLS], [1], [Use GnuTLS])
2323 requirements_pc_ecore_con="gnutls >= 2.10.2 ${requirements_pc_ecore_con}"
2324 requirements_pc_deps_ecore_con="gnutls >= 2.10.2 ${requirements_pc_deps_ecore_con}"
2325 ],
2326 [have_gnutls="no"])
2327fi
2328
2329# openssl
2330
2331have_openssl="no"
2332if test "x${with_tls}" = "xopenssl" ; then
2333 PKG_CHECK_EXISTS([openssl],
2334 [
2335 have_openssl="yes"
2336 AC_DEFINE([USE_OPENSSL], [1], [Use OpenSSL])
2337 requirements_pc_ecore_con="openssl ${requirements_pc_ecore_con}"
2338 requirements_pc_deps_ecore_con="openssl ${requirements_pc_deps_ecore_con}"
2339 ],
2340 [have_openssl="no"])
2341fi
2342
2343# cURL
2344
2345have_curl="no"
2346if test "x${want_curl}" = "xyes" ; then
2347 PKG_CHECK_EXISTS([libcurl],
2348 [
2349 have_curl="yes"
2350 AC_DEFINE([HAVE_CURL], [1], [Downloading with CURL])
2351 requirements_pc_ecore_con="libcurl ${requirements_pc_ecore_con}"
2352 requirements_pc_deps_ecore_con="libcurl ${requirements_pc_deps_ecore_con}"
2353 ],
2354 [have_curl="no"])
2355fi
2356
2357# c-ares
2358
2359have_cares="no"
2360if test "x${want_cares}" = "xyes" ; then
2361 PKG_CHECK_EXISTS([libcares >= 1.6.1],
2362 [
2363 have_cares="yes"
2364 AC_DEFINE([HAVE_CARES], [1], [Build Ecore_Con_Info with c-ares support])
2365 requirements_pc_ecore_con="libcares >= 1.6.1 ${requirements_pc_ecore_con}"
2366 requirements_pc_deps_ecore_con="libcares >= 1.6.1 ${requirements_pc_deps_ecore_con}"
2367 ],
2368 [have_cares="no"])
2369fi
2370
2371AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"])
2372
2373# FIXME: to remove
2374
2375AC_DEFINE(ECORE_HAVE_EET, 1, [Define if Ecore_Con Eet_Connection helper is supported])
2376AM_CONDITIONAL([ECORE_HAVE_EET], [true])
2377
2378PKG_CHECK_MODULES([ECORE_CON], [${requirements_pc_deps_ecore_con}])
2379
2380case "$host_os" in
2381 mingw32ce*)
2382 requirements_libs_ecore_con="${requirements_libs_ecore_con} -lws2"
2383 ;;
2384 mingw*)
2385 requirements_libs_ecore_con="${requirements_libs_ecore_con} -lws2_32"
2386 ;;
2387esac
2388
2389ECORE_CON_CFLAGS="${ECORE_CON_CFLAGS} ${LIBGCRYPT_CFLAGS}"
2390ECORE_CON_LIBS="${ECORE_CON_LIBS} ${LIBGCRYPT_LIBS}"
2391requirements_libs_ecore_con="${requirements_libs_ecore_con} ${LIBGCRYPT_LIBS}"
2392
2393### Checks for header files
2394
2395AC_CHECK_HEADERS([sys/socket.h])
2396AC_CHECK_HEADERS([net/if.h], [], [],
2397[
2398#include <stdio.h>
2399#ifdef STDC_HEADERS
2400# include <stdlib.h>
2401# include <stddef.h>
2402#else
2403# ifdef HAVE_STDLIB_H
2404# include <stdlib.h>
2405# endif
2406#endif
2407#ifdef HAVE_SYS_SOCKET_H
2408# include <sys/socket.h>
2409#endif
2410])
2411AC_CHECK_HEADERS([sys/un.h], [], [],
2412[
2413#include <stdio.h>
2414#ifdef STDC_HEADERS
2415# include <stdlib.h>
2416# include <stddef.h>
2417#else
2418# ifdef HAVE_STDLIB_H
2419# include <stdlib.h>
2420# endif
2421#endif
2422#ifdef HAVE_SYS_SOCKET_H
2423# include <sys/socket.h>
2424#endif
2425])
2426AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h netinet/tcp.h netinet/in.h ws2tcpip.h netdb.h])
2427
2428if test "x${ac_cv_header_netdb_h}" = "xno" && test "x${have_windows}" = "xno"; then
2429 AC_MSG_ERROR([netdb.h is requested to have Ecore_Con. Exiting...])
2430fi
2431
2432### Checks for types
2433
2434have_ipv6="no"
2435if test "x${want_ipv6}" != "xno" ; then
2436 AC_CHECK_TYPES([struct ipv6_mreq],
2437 [have_ipv6="yes"],
2438 [have_ipv6="no"],
2439 [[
2440#ifdef HAVE_NETINET_IN_H
2441# include <netinet/in.h>
2442#endif
2443#ifdef HAVE_WS2TCPIP_H
2444# include <ws2tcpip.h>
2445#endif
2446 ]])
2447fi
2448
2449if test "x${have_ipv6}" = "xyes" ; then
2450 AC_DEFINE([HAVE_IPV6], 1, [Define if IPV6 is supported])
2451fi
2452
2453AM_CONDITIONAL([HAVE_IPV6], [test "x${have_ipv6}" = "xyes"])
2454
2455### Checks for structures
2456
2457### Checks for compiler characteristics
2458
2459EFL_CHECK_COMPILER_FLAGS([ECORE_CON], [-Wno-override-init -Wno-initializer-overrides])
2460
2461### Checks for linker characteristics
2462
2463### Checks for library functions
2464
2465#### End of Ecore_Con
2466
2467
2468#### Ecore_Ipc
2469
2470AC_MSG_NOTICE([Ecore_Ipc checks])
2471
2472### Default values
2473
2474### Additional options to configure
2475
2476### Checks for programs
2477
2478### Checks for libraries
2479
2480# Eina, Ecore, Ecore_Con
2481
2482requirements_pc_ecore_ipc="ecore_con >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_ipc}"
2483
2484### Checks for header files
2485
2486AC_CHECK_HEADERS([winsock2.h])
2487
2488### Checks for types
2489
2490### Checks for structures
2491
2492### Checks for compiler characteristics
2493
2494### Checks for linker characteristics
2495
2496### Checks for library functions
2497
2498#### End of Ecore_Ipc
2499
2500
2501#### Ecore_File
2502
2503AC_MSG_NOTICE([Ecore_File checks])
2504
2505### Additional options to configure
2506
2507AC_ARG_ENABLE([poll],
2508 [AC_HELP_STRING([--disable-poll],
2509 [disable poll in the ecore_file module. @<:@default=enabled@:>@])],
2510 [
2511 if test "x${enableval}" = "xyes" ; then
2512 want_poll="yes"
2513 else
2514 want_poll="no"
2515 fi
2516 ],
2517 [want_poll="yes"])
2518
2519AC_ARG_ENABLE([inotify],
2520 [AC_HELP_STRING([--disable-inotify],
2521 [disable inotify in the ecore_file module. @<:@default=enabled@:>@])],
2522 [
2523 if test "x${enableval}" = "xyes" ; then
2524 want_inotify="yes"
2525 else
2526 want_inotify="no"
2527 fi
2528 ],
2529 [want_inotify="yes"])
2530
2531AC_ARG_ENABLE([atfile-source],
2532 [AC_HELP_STRING([--disable-atfile-source],
2533 [disable use of atfile source functions as openat and mkdirat @<:@default=detect@:>@])],
2534 [
2535 if test "x${enableval}" = "xyes" ; then
2536 have_atfile_source="yes"
2537 else
2538 have_atfile_source="no"
2539 fi],
2540 [have_atfile_source=auto])
2541
2542### Default values
2543
2544have_poll="no"
2545if test "x${want_poll}" = "xyes" ; then
2546 AC_DEFINE([HAVE_POLL], [1], [File monitoring with polling])
2547 have_poll="yes"
2548fi
2549
2550have_notify_win32="no"
2551
2552case "$host_os" in
2553 mingw32ce*)
2554 ;;
2555 mingw32*)
2556 have_notify_win32="yes"
2557 AC_DEFINE([HAVE_NOTIFY_WIN32], [1], [File monitoring with Windows notification])
2558 ;;
2559esac
2560
2561if ! test "x${have_atfile_source}" = "xno" ; then
2562 AC_CHECK_FUNCS([mkdirat],
2563 [
2564 have_atfile_source="yes"
2565 AC_DEFINE(HAVE_ATFILE_SOURCE, 1, [mkdirat exists])
2566 ],
2567 [
2568 if test "x${have_atfile_source}" = "xyes" ; then
2569 AC_MSG_ERROR([required atfile-source but no mkdirat()])
2570 fi
2571 have_atfile_source="no"
2572 ])
2573fi
2574
2575# FIXME: remove that
2576AC_DEFINE([BUILD_ECORE_CON], [1], [Ecore_Con is supported])
2577
2578### Checks for programs
2579
2580### Checks for libraries
2581
2582# Escape library for compilation on PS3
2583
2584if test "x${have_ps3}" = "xyes" ; then
2585 requirements_pc_ecore_file="${requirements_pc_ecore_file} escape >= ${PACKAGE_VERSION}"
2586fi
2587
2588# Eina, Ecore, Ecore_Con
2589
2590requirements_pc_ecore_file="ecore_con >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_file}"
2591
2592### Checks for header files
2593
2594have_inotify="no"
2595if test "x${want_inotify}" = "xyes" ; then
2596 AC_CHECK_HEADER([sys/inotify.h],
2597 [
2598 AC_DEFINE([HAVE_INOTIFY], [1], [File monitoring with Inotify])
2599 have_inotify="yes"
2600 ],
2601 [have_inotify="no"])
2602fi
2603
2604AC_MSG_CHECKING([whether inotify is to be used for filemonitoring])
2605AC_MSG_RESULT(${have_inotify})
2606
2607### Checks for types
2608
2609### Checks for structures
2610
2611### Checks for compiler characteristics
2612
2613### Checks for linker characteristics
2614
2615### Checks for library functions
2616
2617#### End of Ecore_File
2618
2619
2620#### Ecore_Input
2621
2622AC_MSG_NOTICE([Ecore_Input checks])
2623
2624### Additional options to configure
2625
2626### Default values
2627
2628### Checks for programs
2629
2630### Checks for libraries
2631
2632## Eina, Ecore (ecore_input)
2633
2634requirements_pc_ecore_input="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_input}"
2635
2636## Eina, Evas, Ecore, Ecore_Input (ecore_input_evas)
2637
2638requirements_pc_ecore_input_evas="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} evas >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_input_evas}"
2639
2640### Checks for header files
2641
2642### Checks for types
2643
2644### Checks for structures
2645
2646### Checks for compiler characteristics
2647
2648### Checks for linker characteristics
2649
2650### Checks for library functions
2651
2652#### End of Ecore_Input
2653
2654
2655#### Ecore_Cocoa
2656
2657AC_MSG_NOTICE([Ecore_Cocoa checks])
2658
2659### Additional options to configure
2660
2661### Default values
2662
2663have_ecore_cocoa="no"
2664case "$host_os" in
2665 darwin*)
2666 have_ecore_cocoa="yes"
2667 ;;
2668esac
2669
2670### Checks for programs
2671
2672### Checks for libraries
2673
2674## Eina, Ecore, Ecore_Input
2675
2676requirements_pc_ecore_cocoa="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_cocoa}"
2677
2678### Checks for header files
2679
2680ECORE_COCOA_LIBS=""
2681if test "x${have_ecore_cocoa}" = "xyes" ; then
2682 m4_ifdef([AC_PROG_OBJC],
2683 [
2684 if test "x${have_gnu_objc}" = "xyes" ; then
2685 AC_LANG_PUSH([Objective C])
2686 LIBS_save="$LIBS"
2687 LIBS="$LIBS -framework Cocoa"
2688 AC_LINK_IFELSE(
2689 [AC_LANG_PROGRAM(
2690 [[
2691#include <Cocoa/Cocoa.h>
2692 ]],
2693 [[
2694NSWindow *window;
2695window = [[NSWindow alloc]
2696 initWithContentRect:NSMakeRect(0, 0, 1, 1)
2697 styleMask:(NSTitledWindowMask)
2698 backing:NSBackingStoreBuffered
2699 defer:NO
2700 screen:nil
2701 ];
2702 ]])],
2703 [
2704 have_ecore_cocoa="yes"
2705 ECORE_COCOA_LIBS="-framework Cocoa"
2706 requirements_libs_ecore_cocoa="-framework Cocoa"
2707 ],
2708 [have_ecore_cocoa="no"])
2709 LIBS="$LIBS_save"
2710 AC_MSG_CHECKING([whether Cocoa framework is supported])
2711 AC_MSG_RESULT([${have_ecore_cocoa}])
2712 AC_LANG_POP([Objective C])
2713 fi
2714 ])
2715fi
2716AC_SUBST([ECORE_COCOA_LIBS])
2717
2718AM_CONDITIONAL([HAVE_ECORE_COCOA], [test "x${have_ecore_cocoa}" = "xyes"])
2719
2720### Checks for types
2721
2722### Checks for structures
2723
2724### Checks for compiler characteristics
2725
2726### Checks for linker characteristics
2727
2728### Checks for library functions
2729
2730#### End of Ecore_Cocoa
2731
2732
2733#### Ecore_DirectFB
2734
2735AC_MSG_NOTICE([Ecore_DirectFB checks])
2736
2737### Additional options to configure
2738
2739### Default values
2740
2741### Checks for programs
2742
2743### Checks for libraries
2744
2745## Eina, Ecore
2746
2747requirements_pc_ecore_directfb="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_directfb}"
2748
2749## DirectFB
2750
2751PKG_CHECK_MODULES([ECORE_DIRECTFB],
2752 [directfb >= 0.9.16],
2753 [
2754 have_ecore_directfb="yes"
2755 requirements_pc_ecore_directfb="directfb >= 0.9.16 ${requirements_pc_ecore_directfb}"
2756 ],
2757 [have_ecore_directfb="no"])
2758
2759AM_CONDITIONAL([HAVE_ECORE_DIRECTFB], [test "x${have_ecore_directfb}" = "xyes"])
2760
2761### Checks for header files
2762
2763### Checks for types
2764
2765### Checks for structures
2766
2767### Checks for compiler characteristics
2768
2769### Checks for linker characteristics
2770
2771### Checks for library functions
2772
2773#### End of Ecore_Directfb
2774
2775
2776#### Ecore_FB
2777
2778AC_MSG_NOTICE([Ecore_FB checks])
2779
2780### Additional options to configure
2781
2782### Default values
2783
2784want_tslib="no"
2785case "$host_os" in
2786 mingw*|darwin*)
2787 ;;
2788 *)
2789 want_tslib="yes"
2790 ;;
2791esac
2792
2793### Checks for programs
2794
2795### Checks for libraries
2796
2797## Eina, Ecore
2798
2799requirements_pc_ecore_fb="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_fb}"
2800
2801## tslib
2802
2803PKG_CHECK_EXISTS([tslib-1.0],
2804 [
2805 have_tslib="yes"
2806 AC_DEFINE([HAVE_TSLIB], [1], [Build Ecore_FB Touchscreen Code])
2807 requirements_pc_ecore_fb="tslib-1.0 ${requirements_pc_ecore_fb}"
2808 requirements_pc_deps_ecore_fb="tslib-1.0 ${requirements_pc_deps_ecore_fb}"
2809 ],
2810 [have_tslib="no"])
2811
2812if test "x${have_tslib}" = "xno" ; then
2813 PKG_CHECK_EXISTS([tslib],
2814 [
2815 have_tslib="yes"
2816 AC_DEFINE([HAVE_TSLIB], [1], [Build Ecore_FB Touchscreen Code])
2817 requirements_pc_ecore_fb="tslib ${requirements_pc_ecore_fb}"
2818 requirements_pc_deps_ecore_fb="tslib-1.0 ${requirements_pc_deps_ecore_fb}"
2819 ],
2820 [have_tslib="no"])
2821fi
2822
2823if test "x${have_tslib}" = "xno" ; then
2824 AC_CHECK_HEADER([tslib.h], [have_tslib="yes"], [have_tslib="no"])
2825
2826 if test "x${have_tslib}" = "xyes" ; then
2827 AC_CHECK_LIB([ts], [ts_open],
2828 [
2829 have_tslib="yes"
2830 AC_DEFINE([HAVE_TSLIB], [1], [Build Ecore_FB Touchscreen Code])
2831 requirements_libs_ecore_fb="-lts ${requirements_libs_ecore_fb}"
2832 ],
2833 [have_tslib="no"])
2834 fi
2835
2836 if test "x${have_tslib}" = "xno" ; then
2837 AC_CHECK_LIB([tslib], [ts_open],
2838 [
2839 have_tslib="yes"
2840 AC_DEFINE([HAVE_TSLIB], [1], [Build Ecore_FB Touchscreen Code])
2841 requirements_libs_ecore_fb="-ltslib ${requirements_libs_ecore_fb}"
2842 ],
2843 [have_tslib="no"])
2844 fi
2845fi
2846
2847if test "x${requirements_pc_deps_ecore_fb}" = "x" ; then
2848 ECORE_FB_LIBS=${requirements_libs_ecore_fb}
2849 AC_SUBST([ECORE_FB_LIBS])
2850else
2851 PKG_CHECK_MODULES([ECORE_FB], [${requirements_pc_deps_ecore_fb}])
2852fi
2853
2854### Checks for header files
2855
2856have_ecore_fb="no"
2857AC_CHECK_HEADER([linux/fb.h],
2858 [AC_CHECK_HEADER([linux/input.h], [have_ecore_fb="yes"], [have_ecore_fb="no"])])
2859
2860AM_CONDITIONAL([HAVE_ECORE_FB], [test "x${have_ecore_fb}" = "xyes"])
2861
2862### Checks for types
2863
2864### Checks for structures
2865
2866### Checks for compiler characteristics
2867
2868### Checks for linker characteristics
2869
2870### Checks for library functions
2871
2872#### End of Ecore_FB
2873
2874
2875#### Ecore_Psl1ght
2876
2877if test "x${have_ps3}" = "xyes" ; then
2878
2879AC_MSG_NOTICE([Ecore_Psl1ght checks])
2880
2881### Additional options to configure
2882
2883### Default values
2884
2885### Checks for programs
2886
2887### Checks for libraries
2888
2889## Escape, Eina, Ecore, Ecore_Input
2890
2891requirements_pc_ecore_psl1ght="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} escape >= ${PACKAGE_VERSION} ${requirements_pc_ecore_psl1ght}"
2892
2893requirements_libs_ecore_psl1ght="-lio -lsysutil -lgem -lcamera -lspurs"
2894
2895### Checks for header files
2896
2897### Checks for types
2898
2899### Checks for structures
2900
2901### Checks for compiler characteristics
2902
2903### Checks for linker characteristics
2904
2905### Checks for library functions
2906
2907fi
2908
2909#### End of Ecore_Psl1ght
2910
2911
2912#### Ecore_SDL
2913
2914AC_MSG_NOTICE([Ecore_SDL checks])
2915
2916### Additional options to configure
2917
2918### Default values
2919
2920### Checks for programs
2921
2922### Checks for libraries
2923
2924# Escape library for compilation on PS3
2925
2926if test "x${have_ps3}" = "xyes" ; then
2927 requirements_pc_ecore_sdl="${requirements_pc_ecore_sdl} escape >= ${PACKAGE_VERSION}"
2928fi
2929
2930## Eina, Ecore
2931
2932requirements_pc_ecore_sdl="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_sdl}"
2933
2934## SDL
2935
2936PKG_CHECK_MODULES([ECORE_SDL],
2937 [sdl >= 1.2.0],
2938 [
2939 have_ecore_sdl="yes"
2940 requirements_pc_ecore_sdl="sdl >= 1.2.0 ${requirements_pc_ecore_sdl}"
2941 ],
2942 [have_ecore_sdl="no"])
2943
2944if test "x${have_ecore_sdl}" = "xno" ; then
2945 AC_PATH_GENERIC([sdl], [],
2946 [
2947 have_ecore_sdl="yes"
2948 requirements_libs_ecore_sdl="${SDL_LIBS} ${requirements_libs_ecore_sdl}"
2949 ECORE_SDL_CFLAGS=${SDL_CFLAGS}
2950 ECORE_SDL_LIBS=${SDL_LIBS}
2951 ],
2952 [have_ecore_sdl="no"])
2953fi
2954
2955if test "x${have_ecore_sdl}" = "xyes" ; then
2956 PKG_CHECK_EXISTS([sdl >= 1.3.0],
2957 [AC_DEFINE(BUILD_ECORE_EVAS_SDL_130, 1, [Support for SVN SDL])])
2958fi
2959
2960AM_CONDITIONAL([HAVE_ECORE_SDL], [test "x${have_ecore_sdl}" = "xyes"])
2961
2962### Checks for header files
2963
2964### Checks for types
2965
2966### Checks for structures
2967
2968### Checks for compiler characteristics
2969
2970### Checks for linker characteristics
2971
2972### Checks for library functions
2973
2974#### End of Ecore_SDL
2975
2976
2977#### Ecore_Wayland
2978
2979AC_MSG_NOTICE([Ecore_Wayland checks])
2980
2981### Additional options to configure
2982
2983### Default values
2984
2985### Checks for programs
2986
2987### Checks for libraries
2988
2989## Evil, Eina, Ecore, Ecore_Input
2990
2991requirements_pc_ecore_wayland="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} evil >= ${PACKAGE_VERSION} ${requirements_pc_ecore_wayland}"
2992
2993## Wayland
2994
2995PKG_CHECK_MODULES([ECORE_WAYLAND],
2996 [wayland-client wayland-cursor xkbcommon],
2997 [
2998 have_ecore_wayland="yes"
2999 requirements_pc_ecore_wayland="wayland-client wayland-cursor xkbcommon ${requirements_pc_ecore_wayland}"
3000 ],
3001 [have_ecore_wayland="no"])
3002
3003AM_CONDITIONAL([HAVE_ECORE_WAYLAND], [test "x${have_ecore_wayland}" = "xyes"])
3004
3005### Checks for header files
3006
3007### Checks for types
3008
3009### Checks for structures
3010
3011### Checks for compiler characteristics
3012
3013### Checks for linker characteristics
3014
3015### Checks for library functions
3016
3017#### End of Ecore_Wayland
3018
3019
3020#### Ecore_Win32
3021
3022if test "x${have_win32}" = "xyes" ; then
3023
3024AC_MSG_NOTICE([Ecore_Win32 checks])
3025
3026### Additional options to configure
3027
3028### Default values
3029
3030### Checks for programs
3031
3032### Checks for libraries
3033
3034## Evil, Eina, Ecore, Ecore_Input
3035
3036requirements_pc_ecore_win32="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} evil >= ${PACKAGE_VERSION} ${requirements_pc_ecore_win32}"
3037
3038ECORE_WIN32_LIBS="-lole32 -lgdi32"
3039requirements_libs_ecore_win32="-lole32 -lgdi32 ${requirements_libs_ecore_win32}"
3040AC_SUBST([ECORE_WIN32_LIBS])
3041
3042### Checks for header files
3043
3044### Checks for types
3045
3046### Checks for structures
3047
3048### Checks for compiler characteristics
3049
3050### Checks for linker characteristics
3051
3052### Checks for library functions
3053
3054fi
3055
3056#### End of Ecore_Win32
3057
3058
3059#### Ecore_WinCE
3060
3061if test "x${have_wince}" = "xyes" ; then
3062
3063AC_MSG_NOTICE([Ecore_WinCE checks])
3064
3065### Additional options to configure
3066
3067### Default values
3068
3069### Checks for programs
3070
3071### Checks for libraries
3072
3073## Evil, Eina, Ecore, Ecore_Input
3074
3075requirements_pc_ecore_wince="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} evil >= ${PACKAGE_VERSION} ${requirements_pc_ecore_wince}"
3076
3077
3078### Checks for header files
3079
3080### Checks for types
3081
3082### Checks for structures
3083
3084### Checks for compiler characteristics
3085
3086### Checks for linker characteristics
3087
3088### Checks for library functions
3089
3090fi
3091
3092#### End of Ecore_WinCE
3093
3094
3095#### Ecore_X
3096
3097AC_MSG_NOTICE([Ecore_X checks])
3098
3099### Additional options to configure
3100
3101# FIXME: recycle that with evas
3102AC_ARG_WITH([ecore-x-backend],
3103 [AC_HELP_STRING([--ecore-x-backend=BACKEND],
3104 [use the predefined x11 backends, one of: xlib, xcb and none. @<:@default=xlib@:>@])],
3105 [ecore_x_backend=${withval}],
3106 [ecore_x_backend="xlib"])
3107
3108case "${ecore_x_backend}" in
3109 xlib)
3110 have_ecore_x_xlib="yes"
3111 ;;
3112 xcb)
3113 have_ecore_x_xcb="yes"
3114 ;;
3115 none)
3116 have_ecore_x_xcb="no"
3117 have_ecore_x_xlib="no"
3118 ;;
3119 *)
3120 AC_MSG_ERROR([Unknown x11 backend --with-ecore-x-backend=${ecore_x_backend}])
3121 ;;
3122esac
3123
3124AC_ARG_ENABLE(ecore-x-composite,
3125 [AC_HELP_STRING([--disable-ecore-x-composite],
3126 [disable the ecore_x support for Xcomposite extension. @<:@default=detect@:>@])],
3127 [want_ecore_x_composite=$enableval],
3128 [want_ecore_x_composite="yes"])
3129
3130AC_ARG_ENABLE(ecore-x-cursor,
3131 [AC_HELP_STRING([--disable-ecore-x-cursor],
3132 [disable the ecore_x support for Xcursor library. @<:@default=detect@:>@])],
3133 [want_ecore_x_cursor=$enableval],
3134 [want_ecore_x_cursor="yes"])
3135
3136AC_ARG_ENABLE(ecore-x-damage,
3137 [AC_HELP_STRING([--disable-ecore-x-damage],
3138 [disable the ecore_x support for Xdamage extension. @<:@default=detect@:>@])],
3139 [want_ecore_x_damage=$enableval],
3140 [want_ecore_x_damage="yes"])
3141
3142AC_ARG_ENABLE(ecore-x-dpms,
3143 [AC_HELP_STRING([--disable-ecore-x-dpms],
3144 [disable the ecore_x support for Xdpms extension. @<:@default=detect@:>@])],
3145 [want_ecore_x_dpms=$enableval],
3146 [want_ecore_x_dpms="yes"])
3147
3148AC_ARG_ENABLE(ecore-x-dri,
3149 [AC_HELP_STRING([--disable-ecore-x-dri],
3150 [disable the ecore_x support for DRI extension. @<:@default=detect@:>@])],
3151 [want_ecore_x_dri=$enableval],
3152 [want_ecore_x_dri="yes"])
3153
3154AC_ARG_ENABLE(ecore-x-gesture,
3155 [AC_HELP_STRING([--enable-ecore-x-gesture],
3156 [enable the ecore_x support for Xgesture extension. @<:@default=detect@:>@])],
3157 [want_ecore_x_gesture=$enableval],
3158 [want_ecore_x_gesture="yes"])
3159
3160AC_ARG_ENABLE(ecore-x-input,
3161 [AC_HELP_STRING([--disable-ecore-x-input],
3162 [disable the ecore_x support for Xinput/Xinput2 extension. @<:@default=detect@:>@])],
3163 [want_ecore_x_input=$enableval],
3164 [want_ecore_x_input="yes"])
3165
3166AC_ARG_ENABLE(ecore-x-randr,
3167 [AC_HELP_STRING([--disable-ecore-x-randr],
3168 [disable the ecore_x support for Xrandr extension. @<:@default=detect@:>@])],
3169 [want_ecore_x_randr=$enableval],
3170 [want_ecore_x_randr="yes"])
3171
3172AC_ARG_ENABLE(ecore-x-render,
3173 [AC_HELP_STRING([--disable-ecore-x-render],
3174 [disable the ecore_x support for Xrender extension. @<:@default=detect@:>@])],
3175 [want_ecore_x_render=$enableval],
3176 [want_ecore_x_render="yes"])
3177
3178AC_ARG_ENABLE(ecore-x-screensaver,
3179 [AC_HELP_STRING([--disable-ecore-x-screensaver],
3180 [disable the ecore_x support for Xscreensaver extension. @<:@default=detect@:>@])],
3181 [want_ecore_x_screensaver=$enableval],
3182 [want_ecore_x_screensaver="yes"])
3183
3184AC_ARG_ENABLE(ecore-x-shape,
3185 [AC_HELP_STRING([--disable-ecore-x-shape],
3186 [disable the ecore_x support for Xshape extension. @<:@default=detect@:>@])],
3187 [want_ecore_x_shape=$enableval],
3188 [want_ecore_x_shape="yes"])
3189
3190AC_ARG_ENABLE(ecore-x-sync,
3191 [AC_HELP_STRING([--disable-ecore-x-sync],
3192 [disable the ecore_x support for Xsync extension. @<:@default=detect@:>@])],
3193 [want_ecore_x_sync=$enableval],
3194 [want_ecore_x_sync="yes"])
3195
3196AC_ARG_ENABLE(ecore-x-xfixes,
3197 [AC_HELP_STRING([--disable-ecore-x-xfixes],
3198 [disable the ecore_x support for Xfixes extension. @<:@default=detect@:>@])],
3199 [want_ecore_x_xfixes=$enableval],
3200 [want_ecore_x_xfixes="yes"])
3201
3202AC_ARG_ENABLE(ecore-x-xinerama,
3203 [AC_HELP_STRING([--disable-ecore-x-xinerama],
3204 [disable the ecore_x support for Xinerama extension. @<:@default=detect@:>@])],
3205 [want_ecore_x_xinerama=$enableval],
3206 [want_ecore_x_xinerama="yes"])
3207
3208AC_ARG_ENABLE(ecore-x-xprint,
3209 [AC_HELP_STRING([--disable-ecore-x-xprint],
3210 [disable the ecore_x support for Xprint extension. @<:@default=detect@:>@])],
3211 [want_ecore_x_xprint=$enableval],
3212 [want_ecore_x_xprint="yes"])
3213
3214AC_ARG_ENABLE(ecore-x-xtest,
3215 [AC_HELP_STRING([--disable-ecore-x-xtest],
3216 [disable the ecore_x support for Xtest extension. @<:@default=detect@:>@])],
3217 [want_ecore_x_xtest=$enableval],
3218 [want_ecore_x_xtest="yes"])
3219
3220AC_ARG_ENABLE([xim],
3221 [AC_HELP_STRING([--disable-xim], [disable X Input Method.])],
3222 [
3223 if test "x${enableval}" = "xyes" ; then
3224 want_xim="yes"
3225 else
3226 want_xim="no"
3227 fi
3228 ],
3229 [want_xim="yes"])
3230
3231### Default values
3232
3233have_ecore_x="no"
3234use_Xcursor="no"
3235
3236AC_MSG_CHECKING([which X11 backend is to be built])
3237AC_MSG_RESULT([${ecore_x_backend}])
3238
3239### Checks for programs
3240
3241### Checks for libraries
3242
3243## Eina, Ecore, Ecore_Input
3244
3245requirements_pc_ecore_x="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_x}"
3246
3247## Xlib
3248if test "x${have_ecore_x_xlib}" = "xyes" ; then
3249 AC_PATH_XTRA
3250fi
3251
3252## XCB
3253
3254### Checks for header files
3255
3256AC_CHECK_DECL([MAXHOSTNAMELEN], [FOUND_MAXHOSTNAMELEN=yes])
3257
3258if test "x${FOUND_MAXHOSTNAMELEN}" != "xyes" ; then
3259 FOUND_MAXHOSTNAMELEN="not found"
3260
3261 AC_COMPILE_IFELSE(
3262 [
3263 AC_LANG_PROGRAM(
3264 [[
3265#include <sys/param.h>
3266 ]],
3267 [[
3268int h = MAXHOSTNAMELEN;
3269 ]])
3270 ],
3271 [
3272 FOUND_MAXHOSTNAMELEN="sys/param.h"
3273 AC_DEFINE([NEED_SYS_PARAM_H], [1], [Define to 1 if you need <sys/param.h> to define MAXHOSTNAMELEN])
3274 ])
3275
3276 AC_COMPILE_IFELSE(
3277 [
3278 AC_LANG_PROGRAM(
3279 [[
3280#include <netdb.h>
3281 ]],
3282 [[
3283int h = MAXHOSTNAMELEN;
3284 ]])
3285 ],
3286 [
3287 FOUND_MAXHOSTNAMELEN="netdb.h"
3288 AC_DEFINE([NEED_NETDB_H], [1], [Define to 1 if you need <netdb.h> to define MAXHOSTNAMELEN])
3289 ])
3290
3291 AC_MSG_CHECKING([for header that defines MAXHOSTNAMELEN])
3292 AC_MSG_RESULT([$FOUND_MAXHOSTNAMELEN])
3293fi
3294
3295## Xlib
3296if test "x${have_ecore_x_xlib}" = "xyes" ; then
3297 AC_CHECK_HEADERS([X11/X.h],
3298 [
3299 if test "x${want_evas_simple_x11}" = "xyes"; then
3300 x_libs="${x_libs} -lX11 -lXext"
3301 else
3302 x_dir=${x_dir:-/usr/X11R6}
3303 x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
3304 x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
3305 fi
3306 have_ecore_x_xlib="yes"
3307 ])
3308
3309 if test "x$want_ecore_x_cursor" = "xyes"; then
3310 CFLAGS_save="${CFLAGS}"
3311 CFLAGS="$x_cflags $x_includes"
3312 AC_CHECK_HEADER([X11/Xcursor/Xcursor.h],
3313 [use_Xcursor="yes"],
3314 [use_Xcursor="no"],
3315 [#include <X11/Xlib.h>])
3316 CFLAGS="$CFLAGS_save"
3317 fi
3318fi
3319
3320## XCB
3321if test "x${have_ecore_x_xcb}" = "xyes" ; then
3322 KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
3323 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
3324 for i in $FILES; do
3325 if test -f "$KEYSYMDEFDIR/$i"; then
3326 KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i"
3327 elif test "x$i" = "xkeysymdef.h"; then
3328 AC_MSG_ERROR([Cannot find keysymdef.h])
3329 fi
3330 done
3331 AC_MSG_CHECKING([keysym definitions])
3332 AC_MSG_RESULT([$KEYSYMDEFS])
3333 AC_SUBST([KEYSYMDEFS])
3334fi
3335
3336### Checks for types
3337
3338### Checks for structures
3339
3340### Checks for compiler characteristics
3341
3342### Checks for linker characteristics
3343
3344### Checks for library functions
3345
3346## Xlib
3347
3348if test "x${have_ecore_x_xlib}" = "xyes" ; then
3349 AC_CHECK_LIB([X11], [XCreateImage], [have_ecore_x_xlib="yes"], [have_ecore_x_xlib="no"])
3350fi
3351
3352if test "x${have_ecore_x_xlib}" = "xyes" ; then
3353 AC_CHECK_LIB([Xext], [XShmCreateImage], [have_ecore_x_xlib="yes"], [have_ecore_x_xlib="no"])
3354 have_ecore_x="yes"
3355fi
3356
3357if test "x${have_ecore_x_xlib}" = "xyes" && test "x$want_ecore_x_cursor" = "xyes" ; then
3358 AC_CHECK_LIB([Xcursor],
3359 [XcursorImageLoadCursor],
3360 [
3361 use_Xcursor="yes"
3362 AC_DEFINE([ECORE_XCURSOR], 1, [Build support for Xcursor])
3363 Xcursor_libs="-lXcursor"
3364 ],
3365 [use_Xcursor="no"],
3366 [$x_libs -lXrender])
3367 ECORE_X_CFLAGS="${ECORE_X_CFLAGS} $x_cflags $x_includes"
3368 ECORE_X_LIBS="${ECORE_X_LIBS} ${Xcursor_libs}"
3369fi
3370
3371if test "x${have_ecore_x_xlib}" = "xyes" ; then
3372 ECORE_CHECK_X_EXTENSION([Xkb], [XKB.h], [X11], [XkbSetDetectableAutoRepeat], [$want_ecore_x_xkb])
3373 ECORE_CHECK_X_EXTENSION([Xcomposite], [Xcomposite.h], [Xcomposite], [XCompositeQueryExtension], [$want_ecore_x_composite])
3374 ECORE_CHECK_X_EXTENSION([Xdamage], [Xdamage.h], [Xdamage], [XDamageSubtract], [$want_ecore_x_damage])
3375 ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xdpms], [DPMSQueryExtension], [$want_ecore_x_dpms])
3376 if test "x$use_xdpms" = "xno" ; then
3377 ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension], [$want_ecore_x_dpms])
3378 fi
3379 ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion], [$want_ecore_x_xfixes])
3380 ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens], [$want_ecore_x_xinerama])
3381 ECORE_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens], [$want_ecore_x_xprint])
3382 ECORE_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRGetScreenResourcesCurrent], [$want_ecore_x_randr])
3383 ECORE_CHECK_X_EXTENSION([Xgesture], [gesture.h], [Xgesture], [XGestureQueryExtension], [$want_ecore_x_gesture])
3384 ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat], [$want_ecore_x_render])
3385 ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent], [$want_ecore_x_xtest])
3386 ECORE_CHECK_X_EXTENSION([Xss], [scrnsaver.h], [Xss], [XScreenSaverSelectInput], [$want_ecore_x_screensaver])
3387 ECORE_CHECK_X_EXTENSION([Xi2], [XInput2.h], [Xi], [XIQueryDevice], [$want_ecore_x_input])
3388
3389 AC_DEFINE([HAVE_ECORE_X_XLIB], [1], [Defined to 1 if Xlib is enabled.])
3390fi
3391
3392## XCB
3393
3394# FIXME: remove OLD_XCB_VERSION support
3395
3396if test "x${have_ecore_x_xcb}" = "xyes" ; then
3397
3398 PKG_CHECK_EXISTS([x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8],
3399 [
3400 have_ecore_x_xcb="yes"
3401 have_ecore_x="yes"
3402 requirements_pc_ecore_x="${requirements_pc_ecore_x} x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8"
3403 requirements_pc_deps_ecore_x="${requirements_pc_deps_ecore_x} x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8"
3404 ],
3405 [AC_MSG_ERROR([Ecore_X with XCB backend enabled but XCB not available. Exiting...])])
3406fi
3407
3408if test "x${have_ecore_x_xcb}" = "xyes" ; then
3409 if test "x${have_pixman}" = "xyes" ; then
3410 requirements_pc_ecore_x="${requirements_pc_ecore_x} pixman-1"
3411 requirements_pc_deps_ecore_x="${requirements_pc_deps_ecore_x} pixman-1"
3412 fi
3413
3414 if test "x$want_ecore_x_composite" != "xno"; then
3415 PKG_CHECK_EXISTS([xcb-composite],
3416 [
3417 have_ecore_x_xcb_composite="yes"
3418 requirements_pc_ecore_x="xcb-composite ${requirements_pc_ecore_x}"
3419 requirements_pc_deps_ecore_x="xcb-composite ${requirements_pc_deps_ecore_x}"
3420 AC_DEFINE([ECORE_XCB_COMPOSITE], [1], [Build support for XCB composite])
3421 ],
3422 [have_ecore_x_xcb_composite="no"])
3423 else
3424 have_ecore_x_xcb_composite="no"
3425 AC_MSG_NOTICE([composite extension explicitly disabled])
3426 fi
3427
3428 if test "x$want_ecore_x_damage" != "xno"; then
3429 PKG_CHECK_EXISTS([xcb-damage],
3430 [
3431 have_ecore_x_xcb_damage="yes"
3432 requirements_pc_ecore_x="xcb-damage ${requirements_pc_ecore_x}"
3433 requirements_pc_deps_ecore_x="xcb-damage ${requirements_pc_deps_ecore_x}"
3434 AC_DEFINE([ECORE_XCB_DAMAGE], [1], [Build support for XCB damage])
3435 ],
3436 [have_ecore_x_xcb_damage="no"])
3437 else
3438 have_ecore_x_xcb_damage="no"
3439 AC_MSG_NOTICE([damage extension explicitly disabled])
3440 fi
3441
3442 if test "x$want_ecore_x_dpms" != "xno"; then
3443 PKG_CHECK_EXISTS([xcb-dpms],
3444 [
3445 have_ecore_x_xcb_dpms="yes"
3446 requirements_pc_ecore_x="xcb-dpms ${requirements_pc_ecore_x}"
3447 requirements_pc_deps_ecore_x="xcb-dpms ${requirements_pc_deps_ecore_x}"
3448 AC_DEFINE([ECORE_XCB_DPMS], [1], [Build support for XCB dpms])
3449 ],
3450 [have_ecore_x_xcb_dpms="no"])
3451 else
3452 have_ecore_x_xcb_dpms="no"
3453 AC_MSG_NOTICE([dpms extension explicitly disabled])
3454 fi
3455
3456 if test "x$want_ecore_x_randr" != "xno"; then
3457 PKG_CHECK_EXISTS([xcb-randr],
3458 [
3459 have_ecore_x_xcb_randr="yes"
3460 requirements_pc_ecore_x="xcb-randr ${requirements_pc_ecore_x}"
3461 requirements_pc_deps_ecore_x="xcb-randr ${requirements_pc_deps_ecore_x}"
3462 AC_DEFINE([ECORE_XCB_RANDR], [1], [Build support for XCB randr])
3463 ],
3464 [have_ecore_x_xcb_randr="no"])
3465 else
3466 have_ecore_x_xcb_randr="no"
3467 AC_MSG_NOTICE([randr extension explicitly disabled])
3468 fi
3469
3470 if test "x$want_ecore_x_render" != "xno"; then
3471 PKG_CHECK_EXISTS([xcb-render],
3472 [
3473 have_ecore_x_xcb_render="yes"
3474 requirements_pc_ecore_x="xcb-render ${requirements_pc_ecore_x}"
3475 requirements_pc_deps_ecore_x="xcb-render ${requirements_pc_deps_ecore_x}"
3476 AC_DEFINE([ECORE_XCB_RENDER], [1], [Build support for XCB render])
3477 ],
3478 [have_ecore_x_xcb_render="no"])
3479 else
3480 have_ecore_x_xcb_render="no"
3481 AC_MSG_NOTICE([render extension explicitly disabled])
3482 fi
3483
3484 if test "x$want_ecore_x_screensaver" != "xno"; then
3485 PKG_CHECK_EXISTS([xcb-screensaver],
3486 [
3487 have_ecore_x_xcb_screensaver="yes"
3488 requirements_pc_ecore_x="xcb-screensaver ${requirements_pc_ecore_x}"
3489 requirements_pc_deps_ecore_x="xcb-screensaver ${requirements_pc_deps_ecore_x}"
3490 AC_DEFINE([ECORE_XCB_SCREENSAVER], [1], [Build support for XCB screensaver])
3491 ],
3492 [have_ecore_x_xcb_screensaver="no"])
3493 else
3494 have_ecore_x_xcb_screensaver="no"
3495 AC_MSG_NOTICE([screensaver extension explicitly disabled])
3496 fi
3497
3498 if test "x$want_ecore_x_shape" != "xno"; then
3499 PKG_CHECK_EXISTS([xcb-shape],
3500 [
3501 have_ecore_x_xcb_shape="yes"
3502 requirements_pc_ecore_x="xcb-shape ${requirements_pc_ecore_x}"
3503 requirements_pc_deps_ecore_x="xcb-shape ${requirements_pc_deps_ecore_x}"
3504 AC_DEFINE([ECORE_XCB_SHAPE], [1], [Build support for XCB shape])
3505 ],
3506 [have_ecore_x_xcb_shape="no"])
3507 else
3508 have_ecore_x_xcb_shape="no"
3509 AC_MSG_NOTICE([shape extension explicitly disabled])
3510 fi
3511
3512 if test "x$want_ecore_x_gesture" != "xno"; then
3513 PKG_CHECK_EXISTS([xcb-gesture],
3514 [
3515 have_ecore_x_xcb_gesture="yes"
3516 requirements_pc_ecore_x="xcb-gesture ${requirements_pc_ecore_x}"
3517 requirements_pc_deps_ecore_x="xcb-gesture ${requirements_pc_deps_ecore_x}"
3518 AC_DEFINE([ECORE_XCB_XGESTURE], [1], [Build support for XCB xgesture])
3519 ],
3520 [have_ecore_x_xcb_gesture="no"])
3521 else
3522 have_ecore_x_xcb_gesture="no"
3523 AC_MSG_NOTICE([gesture extension explicitly disabled])
3524 fi
3525
3526 if test "x$want_ecore_x_sync" != "xno"; then
3527 PKG_CHECK_EXISTS([xcb-sync],
3528 [
3529 have_ecore_x_xcb_sync="yes"
3530 requirements_pc_ecore_x="xcb-sync ${requirements_pc_ecore_x}"
3531 requirements_pc_deps_ecore_x="xcb-sync ${requirements_pc_deps_ecore_x}"
3532 AC_DEFINE([ECORE_XCB_SYNC], [1], [Build support for XCB sync])
3533 ],
3534 [have_ecore_x_xcb_sync="no"])
3535 else
3536 have_ecore_x_xcb_sync="no"
3537 AC_MSG_NOTICE([sync extension explicitly disabled])
3538 fi
3539
3540 if test "x$want_ecore_x_xfixes" != "xno"; then
3541 PKG_CHECK_EXISTS([xcb-xfixes],
3542 [
3543 have_ecore_x_xcb_xfixes="yes"
3544 requirements_pc_ecore_x="xcb-xfixes ${requirements_pc_ecore_x}"
3545 requirements_pc_deps_ecore_x="xcb-xfixes ${requirements_pc_deps_ecore_x}"
3546 AC_DEFINE([ECORE_XCB_XFIXES], [1], [Build support for XCB xfixes])
3547 ],
3548 [have_ecore_x_xcb_xfixes="no"])
3549 else
3550 have_ecore_x_xcb_xfixes="no"
3551 AC_MSG_NOTICE([xfixes extension explicitly disabled])
3552 fi
3553
3554 if test "x$want_ecore_x_xinerama" != "xno"; then
3555 PKG_CHECK_EXISTS([xcb-xinerama],
3556 [
3557 have_ecore_x_xcb_xinerama="yes"
3558 requirements_pc_ecore_x="xcb-xinerama ${requirements_pc_ecore_x}"
3559 requirements_pc_deps_ecore_x="xcb-xinerama ${requirements_pc_deps_ecore_x}"
3560 AC_DEFINE([ECORE_XCB_XINERAMA], [1], [Build support for XCB xinerama])
3561 ],
3562 [have_ecore_x_xcb_xinerama="no"])
3563 else
3564 have_ecore_x_xcb_xinerama="no"
3565 AC_MSG_NOTICE([xinerama extension explicitly disabled])
3566 fi
3567
3568 if test "x$want_ecore_x_xprint" != "xno"; then
3569 PKG_CHECK_EXISTS([xcb-xprint],
3570 [
3571 have_ecore_x_xcb_xprint="yes"
3572 requirements_pc_ecore_x="xcb-xprint ${requirements_pc_ecore_x}"
3573 requirements_pc_deps_ecore_x="xcb-xprint ${requirements_pc_deps_ecore_x}"
3574 AC_DEFINE([ECORE_XCB_XPRINT], [1], [Build support for XCB xprint])
3575 ],
3576 [have_ecore_x_xcb_xprint="no"])
3577 else
3578 have_ecore_x_xcb_xprint="no"
3579 AC_MSG_NOTICE([xprint extension explicitly disabled])
3580 fi
3581
3582 if test "x$want_ecore_x_xtest" != "xno"; then
3583 PKG_CHECK_EXISTS([xcb-xtest],
3584 [
3585 have_ecore_x_xcb_xtest="yes"
3586 requirements_pc_ecore_x="xcb-xtest ${requirements_pc_ecore_x}"
3587 requirements_pc_deps_ecore_x="xcb-xtest ${requirements_pc_deps_ecore_x}"
3588 AC_DEFINE([ECORE_XCB_XTEST], [1], [Build support for XCB xtest])
3589 ],
3590 [have_ecore_x_xcb_xtest="no"])
3591 else
3592 have_ecore_x_xcb_xtest="no"
3593 AC_MSG_NOTICE([xtest extension explicitly disabled])
3594 fi
3595
3596# input extension disabled currently in xcb as xcb-input has some issues
3597 want_ecore_x_input="no"
3598 if test "x$want_ecore_x_input" != "xno"; then
3599 PKG_CHECK_EXISTS([xcb-xinput],
3600 [
3601 have_ecore_x_xcb_xinput="yes"
3602 requirements_pc_ecore_x="xcb-xinput ${requirements_pc_ecore_x}"
3603 requirements_pc_deps_ecore_x="xcb-xinput ${requirements_pc_deps_ecore_x}"
3604 AC_DEFINE([ECORE_XCB_XINPUT], [1], [Build support for XCB input])
3605 ],
3606 [have_ecore_x_xcb_xinput="no"])
3607 else
3608 have_ecore_x_xcb_xinput="no"
3609 AC_MSG_NOTICE([input extension explicitly disabled])
3610 fi
3611
3612 if test "x$want_ecore_x_cursor" != "xno"; then
3613 PKG_CHECK_EXISTS([xcb-render xcb-renderutil],
3614 [
3615 have_ecore_x_xcb_cursor="yes"
3616 requirements_pc_ecore_x="xcb-render xcb-renderutil ${requirements_pc_ecore_x}"
3617 requirements_pc_deps_ecore_x="xcb-render xcb-renderutil ${requirements_pc_deps_ecore_x}"
3618 AC_DEFINE([ECORE_XCB_CURSOR], [1], [Build support for XCB cursor])
3619 ],
3620 [have_ecore_x_xcb_cursor="no"])
3621 else
3622 have_ecore_x_xcb_cursor="no"
3623 AC_MSG_NOTICE([cursor extension explicitly disabled])
3624 fi
3625
3626# dri extension disabled currently in xcb
3627 want_ecore_x_dri="no"
3628 if test "x$want_ecore_x_dri" != "xno"; then
3629 PKG_CHECK_EXISTS([xcb-dri2],
3630 [
3631 have_ecore_x_xcb_dri="yes"
3632 requirements_pc_ecore_x="xcb-dri2 ${requirements_pc_ecore_x}"
3633 requirements_pc_deps_ecore_x="xcb-dri2 ${requirements_pc_deps_ecore_x}"
3634 AC_DEFINE([ECORE_XCB_DRI], [1], [Build support for XCB dri])
3635 ],
3636 [have_ecore_x_xcb_dri="no"])
3637 else
3638 have_ecore_x_xcb_dri="no"
3639 AC_MSG_NOTICE([dri extension explicitly disabled])
3640 fi
3641
3642 PKG_CHECK_MODULES([ECORE_X], [${requirements_pc_deps_ecore_x}])
3643 EFL_CHECK_FUNCS([ECORE_X], [dlopen iconv])
3644 AC_DEFINE([HAVE_ECORE_X_XCB], [1], [Defined to 1 if XCB is enabled.])
3645 have_ecore_x_xcb_define="-DHAVE_ECORE_X_XCB"
3646 AC_SUBST([have_ecore_x_xcb_define])
3647fi
3648
3649requirements_libs_ecore_x="${requirements_libs_ecore_x} ${ECORE_X_LIBS}"
3650
3651AC_SUBST([ECORE_X_CFLAGS])
3652AC_SUBST([ECORE_X_LIBS])
3653
3654AM_CONDITIONAL([HAVE_ECORE_X_XLIB], [test "x${have_ecore_x_xlib}" = "xyes"])
3655AM_CONDITIONAL([HAVE_ECORE_X_XCB], [test "x${have_ecore_x_xcb}" = "xyes"])
3656AM_CONDITIONAL([HAVE_ECORE_X], [test "x${have_ecore_x}" = "xyes"])
3657
3658#### End of Ecore_X
3659
3660
3661#### Ecore_Imf
3662
3663AC_MSG_NOTICE([Ecore_Imf checks])
3664
3665### Additional options to configure
3666
3667### Default values
3668
3669want_ecore_imf="yes"
3670want_ecore_imf_xim="no"
3671want_ecore_imf_scim="no"
3672want_ecore_imf_ibus="no"
3673
3674case "$host_os" in
3675 mingw32ce*)
3676 want_ecore_imf="no"
3677 ;;
3678 mingw*)
3679 want_ecore_imf="yes"
3680 ;;
3681 darwin*)
3682 want_ecore_imf="yes"
3683 ;;
3684 *)
3685 want_ecore_imf="yes"
3686 want_ecore_imf_xim="yes"
3687 want_ecore_imf_scim="yes"
3688 want_ecore_imf_ibus="yes"
3689 ;;
3690esac
3691
3692### Checks for programs
3693
3694### Checks for libraries
3695
3696# Escape library for compilation on PS3
3697
3698if test "x${have_ps3}" = "xyes" ; then
3699 requirements_pc_ecore_imf="${requirements_pc_ecore_imf} escape >= ${PACKAGE_VERSION}"
3700 requirements_pc_ecore_imf_evas="${requirements_pc_ecore_imf_evas} escape >= ${PACKAGE_VERSION}"
3701fi
3702
3703## Eina, Ecore (ecore_imf)
3704
3705requirements_pc_ecore_imf="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_imf}"
3706
3707## Eina, Evas, Ecore, Ecore_Imf (ecore_imf_evas)
3708
3709requirements_pc_ecore_imf_evas="ecore_imf >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} evas >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_imf_evas}"
3710
3711## modules
3712
3713# ibus
3714
3715have_ecore_imf_ibus="no"
3716if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; then
3717 PKG_CHECK_MODULES([IBUS],
3718 [ibus-1.0 >= 1.4],
3719 [
3720 have_ecore_imf_ibus="yes"
3721 AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support])
3722 ],
3723 [have_ecore_imf_ibus="no"])
3724 IBUS_CFLAGS="${GLIB_CFLAGS} ${IBUS_CFLAGS}"²
3725 IBUS_LIBS="${GLIB_LIBS} ${IBUS_LIBS}"
3726fi
3727
3728AM_CONDITIONAL([BUILD_ECORE_IMF_IBUS], [test "x${have_ecore_imf_ibus}" = "xyes"])
3729
3730# scim
3731
3732if test "x${want_ecore_imf_scim}" = "xyes" ; then
3733 PKG_CHECK_MODULES([SCIM],
3734 [scim],
3735 [
3736 have_ecore_imf_scim="yes"
3737 AC_DEFINE([BUILD_ECORE_IMF_SCIM], [1], [Ecore Imf SCIM Support])
3738 ],
3739 [have_ecore_imf_scim="no"])
3740fi
3741
3742AM_CONDITIONAL([BUILD_ECORE_IMF_SCIM], [test "x${have_ecore_imf_scim}" = "xyes"])
3743
3744# xim
3745
3746have_ecore_imf_xim="no"
3747if test "x${want_xim}" = "xyes" && test "x${want_ecore_imf_xim}" = "xyes" ; then
3748 have_ecore_imf_xim="yes"
3749 AC_DEFINE([ENABLE_XIM], [1], [Enable X Input Method])
3750fi
3751
3752AM_CONDITIONAL([BUILD_ECORE_IMF_XIM], [test "x${have_ecore_imf_xim}" = "xyes"])
3753
3754### Checks for header files
3755
3756### Checks for types
3757
3758### Checks for structures
3759
3760### Checks for compiler characteristics
3761
3762### Checks for linker characteristics
3763
3764### Checks for library functions
3765
3766#### End of Ecore_Imf
3767
3768
3769#### Ecore_Evas
3770
3771AC_MSG_NOTICE([Ecore_Evas checks])
3772
3773### Additional options to configure
3774
3775### Default values
3776
3777have_ecore_evas="yes"
3778
3779want_ecore_evas_software_buffer="yes"
3780want_ecore_evas_software_x11="no"
3781want_ecore_evas_opengl_x11="no"
3782want_ecore_evas_software_xcb="no"
3783want_ecore_evas_software_gdi="no"
3784want_ecore_evas_software_ddraw="no"
3785want_ecore_evas_software_sdl="no"
3786want_ecore_evas_gl_sdl="no"
3787want_ecore_evas_gl_cocoa="no"
3788want_ecore_evas_directfb="no"
3789want_ecore_evas_fb="no"
3790want_ecore_evas_ews="yes"
3791want_ecore_evas_extn="yes"
3792want_ecore_evas_wayland_shm="no"
3793want_ecore_evas_wayland_egl="no"
3794
3795case "$host_os" in
3796 mingw32ce*)
3797 want_ecore_evas_extn="no"
3798 ;;
3799 mingw*)
3800 want_ecore_evas_software_gdi="yes"
3801 want_ecore_evas_software_ddraw="yes"
3802 want_ecore_evas_software_sdl="yes"
3803 want_ecore_evas_gl_sdl="yes"
3804 ;;
3805 darwin*)
3806 want_ecore_evas_software_sdl="yes"
3807 want_ecore_evas_gl_sdl="yes"
3808 want_ecore_evas_gl_cocoa="yes"
3809 ;;
3810 *)
3811 want_ecore_evas_software_x11="yes"
3812 want_ecore_evas_opengl_x11="yes"
3813 want_ecore_evas_software_xcb="no"
3814 want_ecore_evas_software_sdl="yes"
3815 want_ecore_evas_gl_sdl="yes"
3816 want_ecore_evas_gl_cocoa="no"
3817 want_ecore_evas_directfb="yes"
3818 want_ecore_evas_fb="yes"
3819 want_ecore_evas_wayland_shm="yes"
3820 want_ecore_evas_wayland_egl="yes"
3821 ;;
3822esac
3823
3824### Checks for programs
3825
3826### Checks for libraries
3827
3828## Eina, Evas, Ecore, Ecore_Input
3829
3830requirements_pc_ecore_evas="ecore-input-evas >= ${PACKAGE_VERSION} ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} evas >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
3831
3832## modules
3833
3834# ecore_evas_buffer
3835
3836ECORE_EVAS_CHECK_MODULE_FULL([software-buffer],
3837 [${have_evas_engine_buffer}],
3838 [${want_ecore_evas_software_buffer}],
3839 [Software Buffer],
3840 [yes])
3841
3842# ecore_evas_cocoa
3843
3844ECORE_EVAS_CHECK_MODULE_FULL([opengl-cocoa],
3845 [${have_evas_engine_gl_cocoa}],
3846 [${want_ecore_evas_gl_cocoa}],
3847 [OpenGL Cocoa],
3848 [${have_ecore_cocoa}],
3849 [requirements_pc_ecore_evas="ecore-cocoa >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"])
3850
3851# ecore_evas_directfb
3852
3853ECORE_EVAS_CHECK_MODULE_FULL([directfb],
3854 [${have_evas_engine_directfb}],
3855 [${want_ecore_evas_directfb}],
3856 [DirectFB],
3857 [${have_ecore_directfb}],
3858 [requirements_pc_ecore_evas="ecore-directfb >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"])
3859
3860# ecore_evas_ews
3861
3862ECORE_EVAS_CHECK_MODULE_FULL([ews],
3863 [${have_evas_engine_buffer}],
3864 [${want_ecore_evas_ews}],
3865 [Ecore Evas Single Process Windowing System],
3866 [yes], [])
3867
3868# ecore_evas_extn
3869
3870have_extn="yes"
3871if test "x${have_ecore_ipc}" = "xno" || \
3872 test "x${have_ecore_evas_software_buffer}" = "xno" || \
3873 test "x${have_shm_open}" = "xno" ; then
3874 have_extn="no"
3875fi
3876
3877dnl THIS IS SPECIAL - dont use normal ECORE_EVAS_CHECK_MODULE
3878have_ecore_evas_extn="no"
3879if test "x${want_ecore_evas_extn}" = "xyes" && \
3880 test "x${have_extn}" = "xyes" && \
3881 test "x${have_ecore_evas}" = "xyes"; then
3882 have_ecore_evas_extn="yes"
3883 AC_DEFINE([BUILD_ECORE_EVAS_EXTN], [1], [Support for Extn Engine in Ecore_Evas])
3884 requirements_pc_ecore_evas="ecore-ipc >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
3885fi
3886
3887# ecore_evas_fb
3888
3889ECORE_EVAS_CHECK_MODULE_FULL([fb],
3890 [${have_evas_engine_fb}],
3891 [${want_ecore_evas_fb}],
3892 [Linux Framebuffer],
3893 [${have_ecore_fb}],
3894 [requirements_pc_ecore_evas="ecore-fb >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"])
3895
3896# ecore_evas_psl1ght
3897
3898ECORE_EVAS_CHECK_MODULE_FULL([psl1ght],
3899 [${have_evas_engine_psl1ght}],
3900 [${want_ecore_evas_psl1ght}],
3901 [PSL1GHT],
3902 [${have_ecore_psl1ght}],
3903 [requirements_pc_ecore_evas="ecore-psl1ght >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"])
3904
3905# ecore_evas_sdl
3906
3907ECORE_EVAS_CHECK_MODULE_FULL([software-sdl],
3908 [${have_evas_engine_software_sdl}],
3909 [${want_ecore_evas_software_sdl}],
3910 [Software SDL],
3911 [${have_ecore_sdl}],
3912 [requirements_ecore_evas="ecore-sdl >= ${PACKAGE_VERSION} ${requirements_ecore_evas}"])
3913
3914ECORE_EVAS_CHECK_MODULE_FULL([opengl-sdl],
3915 [${have_evas_engine_gl_sdl}],
3916 [${want_ecore_evas_gl_sdl}],
3917 [OpenGL SDL],
3918 [${have_ecore_sdl}],
3919 [requirements_ecore_evas="ecore-sdl >= ${PACKAGE_VERSION} ${requirements_ecore_evas}"])
3920
3921# ecore_evas_wayland
3922
3923ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm],
3924 [wayland-shm],
3925 [${want_ecore_evas_wayland_shm}],
3926 [Wayland Shm],
3927 [${have_ecore_wayland}],
3928 [requirements_pc_ecore_evas="ecore-wayland >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"])
3929
3930ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl],
3931 [wayland-egl egl >= 7.10],
3932 [${want_ecore_evas_wayland_egl}],
3933 [Wayland Egl],
3934 [${have_ecore_wayland}],
3935 [
3936 PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl], [have_wayland_egl="yes"], [have_wayland_egl="no"])
3937 if test "x${have_wayland_egl}" = "xyes" ; then
3938 requirements_pc_ecore_evas="wayland-egl egl >= 7.10 ecore-wayland >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
3939 requirements_pc_deps_ecore_evas="wayland-egl egl >= 7.10 ecore-wayland >= ${PACKAGE_VERSION} ${requirements_pc_deps_ecore_evas}"
3940 fi
3941 ])
3942
3943# ecore_evas_win32
3944ECORE_EVAS_CHECK_MODULE_FULL([software-gdi],
3945 [${have_evas_engine_software_gdi}],
3946 [${want_ecore_evas_software_gdi}],
3947 [Software GDI],
3948 [${have_win32}])
3949
3950ECORE_EVAS_CHECK_MODULE_FULL([software-ddraw],
3951 [${have_evas_engine_software_ddraw}],
3952 [${want_ecore_evas_software_ddraw}],
3953 [Software DirectDraw],
3954 [${have_win32}])
3955
3956if test "x${have_ecore_evas_software_gdi}" = "xyes" || \
3957 test "x${have_ecore_evas_software_ddraw}" = "xyes" ; then
3958 AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas])
3959 requirements_pc_ecore_evas="ecore-win32 >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
3960fi
3961
3962# ecore_evas_x11
3963
3964ECORE_EVAS_CHECK_MODULE_FULL([software-x11],
3965 [${have_evas_engine_software_x11}],
3966 [${want_ecore_evas_software_x11}],
3967 [Software X11],
3968 [${have_ecore_x}])
3969
3970have_ecore_evas_software_xlib="no"
3971have_ecore_evas_software_xcb="no"
3972if test "x$have_ecore_evas_software_x11" = "xyes" ; then
3973 have_ecore_evas_software_xlib=`${PKG_CONFIG} --variable=Xlib evas-software-x11`
3974 if test "x${have_ecore_evas_software_xlib}" = "xstatic"; then
3975 have_ecore_evas_software_xlib="yes"
3976 fi
3977 if test "x${have_ecore_evas_software_xlib}" = "xyes" && test "x${have_ecore_x_xlib}" = "xyes" ; then
3978 AC_DEFINE([BUILD_ECORE_EVAS_SOFTWARE_XLIB], [1], [Evas Software Xlib Engine Support])
3979 fi
3980 have_ecore_evas_software_xcb=`${PKG_CONFIG} --variable=XCB evas-software-x11`
3981 if test "x$have_ecore_evas_software_xcb" = "xstatic"; then
3982 have_ecore_evas_software_xcb="yes"
3983 fi
3984 if test "x$have_ecore_evas_software_xcb" = "xyes" && test "x${have_ecore_x_xcb}" = "xyes" ; then
3985 AC_DEFINE([BUILD_ECORE_EVAS_SOFTWARE_XCB], [1], [Evas Software XCB Engine Support])
3986 fi
3987fi
3988
3989# ecore_evas_opengl_x11
3990
3991ECORE_EVAS_CHECK_MODULE_FULL([opengl-x11],
3992 [${have_evas_engine_gl_x11}],
3993 [${want_ecore_evas_opengl_x11}],
3994 [OpenGL Xlib],
3995 [${have_ecore_x}])
3996
3997have_ecore_evas_opengl_xlib="no"
3998have_ecore_evas_opengl_xcb="no"
3999if test "x${have_ecore_evas_opengl_x11}" = "xyes" || test "x${have_ecore_evas_opengl_x11}" = "xstatic" ; then
4000 have_ecore_evas_opengl_xlib=`${PKG_CONFIG} --variable=Xlib evas-opengl-x11`
4001 if test "x${have_ecore_evas_opengl_xlib}" = "xyes" ; then
4002 AC_DEFINE([BUILD_ECORE_EVAS_OPENGL_XLIB], [1], [OpenGL Xlib rendering backend])
4003 fi
4004
4005# opengl does not work with xcb (yet)
4006 have_ecore_evas_opengl_xcb=`${PKG_CONFIG} --variable=XCB evas-opengl-x11`
4007 if test "x${have_ecore_evas_opengl_xcb}" = "xstatic"; then
4008 have_ecore_evas_opengl_xcb="yes"
4009 fi
4010 if test "x${have_ecore_evas_opengl_xcb}" = "xyes" && test "x${have_ecore_x_xcb}" = "xyes" ; then
4011 PKG_CHECK_MODULES([XCB_X11],
4012 [x11-xcb],
4013 [
4014 have_ecore_x_opengl_xcb="yes"
4015 requirements_ecore_x="x11-xcb ${requirements_ecore_x}"
4016 AC_DEFINE([BUILD_ECORE_X_OPENGL_XCB], [1], [Build support for XCB-based OpenGL])
4017 AC_DEFINE([BUILD_ECORE_EVAS_OPENGL_XCB], [1], [OpenGL XCB rendering backend])
4018 ],
4019 [have_ecore_x_opengl_xcb="no"])
4020 else
4021 have_ecore_x_opengl_xcb="no"
4022 AC_MSG_NOTICE(["XCB-based OpenGL explicitly disabled"])
4023 fi
4024fi
4025
4026if test "x$have_ecore_evas_software_x11" = "xyes" || \
4027 test "x$have_ecore_evas_opengl_x11" = "xyes" || \
4028 test "x$have_ecore_evas_software_xcb" = "xyes"; then
4029 AC_DEFINE([BUILD_ECORE_EVAS_X11], [1], [Support for X Window Engines in Ecore_Evas])
4030 requirements_pc_ecore_evas="ecore-x >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
4031fi
4032
4033if test "x${requirements_pc_deps_ecore_evas}" = "x" ; then
4034 ECORE_EVAS_CFLAGS=""
4035 ECORE_EVAS_LIBS=""
4036 AC_SUBST([ECORE_EVAS_CFLAGS])
4037 AC_SUBST([ECORE_EVAS_LIBS])
4038else
4039 PKG_CHECK_MODULES([ECORE_EVAS], [${requirements_pc_deps_ecore_evas}])
4040fi
4041
4042### Checks for header files
4043
4044### Checks for types
4045
4046### Checks for structures
4047
4048### Checks for compiler characteristics
4049
4050### Checks for linker characteristics
4051
4052### Checks for library functions
4053
4054#### End of Ecore_Evas
4055
4056
1857AC_CONFIG_FILES([ 4057AC_CONFIG_FILES([
1858Makefile 4058Makefile
1859data/Makefile 4059data/Makefile
@@ -1874,8 +4074,6 @@ pc/evil.pc
1874pc/eina.pc 4074pc/eina.pc
1875pc/eet.pc 4075pc/eet.pc
1876pc/eo.pc 4076pc/eo.pc
1877pc/embryo.pc
1878pc/evas-direct3d.pc
1879pc/evas-directfb.pc 4077pc/evas-directfb.pc
1880pc/evas-fb.pc 4078pc/evas-fb.pc
1881pc/evas-opengl-x11.pc 4079pc/evas-opengl-x11.pc
@@ -1890,6 +4088,24 @@ pc/evas-software-sdl.pc
1890pc/evas-wayland-shm.pc 4088pc/evas-wayland-shm.pc
1891pc/evas-wayland-egl.pc 4089pc/evas-wayland-egl.pc
1892pc/evas.pc 4090pc/evas.pc
4091pc/ecore.pc
4092pc/ecore-con.pc
4093pc/ecore-ipc.pc
4094pc/ecore-file.pc
4095pc/ecore-input.pc
4096pc/ecore-input-evas.pc
4097pc/ecore-cocoa.pc
4098pc/ecore-directfb.pc
4099pc/ecore-fb.pc
4100pc/ecore-sdl.pc
4101pc/ecore-win32.pc
4102pc/ecore-wince.pc
4103pc/ecore-x.pc
4104pc/ecore-evas.pc
4105pc/ecore-imf.pc
4106pc/ecore-imf-evas.pc
4107pc/embryo.pc
4108$po_makefile_in
1893]) 4109])
1894 4110
1895AC_OUTPUT 4111AC_OUTPUT
@@ -1917,6 +4133,7 @@ echo " barrier............: ${efl_have_pthread_barrier}"
1917echo " affinity...........: ${efl_have_setaffinity}" 4133echo " affinity...........: ${efl_have_setaffinity}"
1918echo " Cryptographic System.: ${build_crypto}" 4134echo " Cryptographic System.: ${build_crypto}"
1919echo 4135echo
4136
1920echo "Evas:" 4137echo "Evas:"
1921echo 4138echo
1922echo " Engines:" 4139echo " Engines:"
@@ -1930,8 +4147,7 @@ else
1930fi 4147fi
1931echo " Software GDI...............: $have_evas_engine_software_gdi" 4148echo " Software GDI...............: $have_evas_engine_software_gdi"
1932echo " Software DirectDraw........: $have_evas_engine_software_ddraw" 4149echo " Software DirectDraw........: $have_evas_engine_software_ddraw"
1933echo " Direct3d...................: $have_evas_engine_direct3d" 4150echo $ECHO_N " OpenGL SDL.................: $have_evas_engine_gl_sdl $ECHO_C"
1934echo " OpenGL SDL.................: $have_evas_engine_gl_sdl $ECHO_C"
1935if test "x$have_evas_engine_gl_sdl" = "xyes"; then 4151if test "x$have_evas_engine_gl_sdl" = "xyes"; then
1936 echo "(GLES: $gl_flavor_gles)" 4152 echo "(GLES: $gl_flavor_gles)"
1937else 4153else
@@ -1985,6 +4201,133 @@ echo " Line Dither Mask........: $conv_line_dither"
1985echo " No Dither Mask for 16bpp: $conv_no_dither" 4201echo " No Dither Mask for 16bpp: $conv_no_dither"
1986echo " Tiled 32BPP rotate......: $have_tile_rotate" 4202echo " Tiled 32BPP rotate......: $have_tile_rotate"
1987echo 4203echo
4204
4205echo "Ecore:"
4206echo " Thread safety..............: $want_thread_safety"
4207echo " GLib support...............: $with_glib"
4208echo " Use g_main_loop............: $want_g_main_loop"
4209echo " Gathering memory statistic.: $ac_cv_func_mallinfo"
4210echo " Gathering timer allocation.: $want_ecore_timer_dump"
4211echo
4212
4213echo "Ecore_Con:"
4214if test "x${have_gnutls}" = "xyes" || test "x${have_openssl}" = "xyes" ; then
4215echo " TLS........................: $with_tls"
4216else
4217echo " TLS........................: no"
4218fi
4219echo " IPv6.......................: $have_ipv6"
4220echo " CURL.......................: $have_curl"
4221echo " Local Sockets..............: $want_ecore_con_local_sockets"
4222if test "x$want_ecore_con_local_sockets" = "xyes" ; then
4223echo " Abstract Sockets...........: $want_ecore_con_abstract_sockets"
4224fi
4225if test "x$have_cares" = "xyes" ; then
4226echo " Resolver...................: c-ares"
4227elif test "x$have_ipv6" = "xyes" ; then
4228echo " Resolver...................: dns.c"
4229else
4230echo " Resolver...................: fork"
4231fi
4232echo
4233
4234echo "Ecore_Ipc:"
4235echo " TLS........................: $with_tls"
4236echo
4237
4238echo "Ecore_File:"
4239echo " Inotify....................: $have_inotify"
4240echo " Windows notification.......: $have_notify_win32"
4241echo " Poll.......................: $have_poll"
4242echo " CURL.......................: $have_curl"
4243echo
4244
4245echo "Ecore_IMF....................: $have_ecore_imf"
4246echo " XIM........................: $have_ecore_imf_xim"
4247echo " SCIM.......................: $have_ecore_imf_scim"
4248echo " IBUS.......................: $have_ecore_imf_ibus"
4249echo "Ecore_IMF_Evas...............: $have_ecore_imf_evas"
4250echo
4251
4252echo "Ecore Graphic systems:"
4253echo
4254
4255if test "x$have_ecore_x" = "xyes" ; then
4256 if test "x$have_ecore_x_xcb" = "xyes" ; then
4257 echo " Ecore_X (XCB backend)........: $have_ecore_x_xcb"
4258 echo " Xprint.....................: $have_ecore_x_xcb_xprint"
4259 echo " Xinerama...................: $have_ecore_x_xcb_xinerama"
4260 echo " Xrandr.....................: $have_ecore_x_xcb_randr"
4261 echo " Xscreensaver...............: $have_ecore_x_xcb_screensaver"
4262 echo " Xshape.....................: $have_ecore_x_xcb_shape"
4263 echo " Xgesture...................: $have_ecore_x_xcb_gesture"
4264 echo " Xsync......................: $have_ecore_x_xcb_sync"
4265 echo " Xrender....................: $have_ecore_x_xcb_render"
4266 echo " Xcomposite.................: $have_ecore_x_xcb_composite"
4267 echo " Xfixes.....................: $have_ecore_x_xcb_xfixes"
4268 echo " Xdamage....................: $have_ecore_x_xcb_damage"
4269 echo " Xdpms......................: $have_ecore_x_xcb_dpms"
4270 echo " Xtest......................: $have_ecore_x_xcb_xtest"
4271 else
4272 echo " Ecore_X (Xlib backend).......: $have_ecore_x"
4273 echo " Xcursor....................: $use_Xcursor"
4274 echo " Xkb........................: $use_xkb"
4275 echo " Xprint.....................: $use_xprint"
4276 echo " Xinerama...................: $use_xinerama"
4277 echo " Xrandr.....................: $use_xrandr"
4278 echo " Xgesture...................: $use_xgesture"
4279 echo " Xscreensaver...............: $use_xss"
4280 echo " Xrender....................: $use_xrender"
4281 echo " Xcomposite.................: $use_xcomposite"
4282 echo " Xfixes.....................: $use_xfixes"
4283 echo " Xdamage....................: $use_xdamage"
4284 echo " Xdpms......................: $use_xdpms"
4285 echo " Xtest......................: $use_xtest"
4286 echo " XIM........................: $want_xim"
4287 echo " Xi2........................: $use_xi2"
4288 fi
4289else
4290 echo " Ecore_X....................: $have_ecore_x"
4291fi
4292echo " Ecore_Win32................: $have_win32"
4293echo " Ecore_Cocoa................: $have_ecore_cocoa"
4294echo " Ecore_SDL..................: $have_ecore_sdl"
4295echo " Ecore_FB...................: $have_ecore_fb"
4296if test "x${have_ecore_fb}" = "xyes" ; then
4297 echo " Touchscreen..............: $have_tslib"
4298fi
4299echo " Ecore_DirectFB.............: $have_ecore_directfb"
4300echo " Ecore_WinCE................: $have_wince"
4301echo " Ecore_PSL1GHT..............: $have_ps3"
4302echo " Ecore_Wayland..............: $have_ecore_wayland"
4303
4304echo " Ecore_Evas...................: $have_ecore_evas"
4305#if test "x${have_ecore_evas}" = "xyes" ; then
4306 echo " Software Memory Buffer.....: $have_ecore_evas_software_buffer"
4307 if test "x${have_ecore_evas_software_x11}" = "xyes" ; then
4308 echo " Software X11...............: $have_ecore_evas_software_x11 (Xlib=${have_ecore_evas_software_xlib}) (XCB=${have_ecore_evas_software_xcb})"
4309 else
4310 echo " Software X11...............: $have_ecore_evas_software_x11"
4311 fi
4312 if test "x${have_ecore_evas_opengl_x11}" = "xyes" ; then
4313 echo " OpenGL X11.................: $have_ecore_evas_opengl_x11 (Xlib=${have_ecore_evas_opengl_xlib}) (XCB=${have_ecore_evas_opengl_xcb})"
4314 else
4315 echo " OpenGL X11.................: $have_ecore_evas_opengl_x11"
4316 fi
4317 echo " Software GDI...............: $have_ecore_evas_software_gdi"
4318 echo " Software DirectDraw........: $have_ecore_evas_software_ddraw"
4319 echo " Software SDL...............: $have_ecore_evas_software_sdl"
4320 echo " OpenGL SDL.................: $have_ecore_evas_opengl_sdl"
4321 echo " OpenGL Cocoa...............: $have_ecore_evas_opengl_cocoa"
4322 echo " DirectFB...................: $have_ecore_evas_directfb"
4323 echo " PSL1GHT....................: $have_ecore_evas_psl1ght"
4324 echo " Software Framebuffer.......: $have_ecore_evas_fb"
4325 echo " Sing.Proc. Windowing System: $have_ecore_evas_ews"
4326 echo " Wayland Shm................: $have_ecore_evas_wayland_shm"
4327 echo " Wayland Egl................: $have_ecore_evas_wayland_egl"
4328 echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn"
4329#fi
4330echo
1988echo "Tests..................: ${_efl_enable_tests}" 4331echo "Tests..................: ${_efl_enable_tests}"
1989if test "x${_efl_enable_tests}" = "xyes"; then 4332if test "x${_efl_enable_tests}" = "xyes"; then
1990echo " Coverage...........: ${_efl_enable_coverage}" 4333echo " Coverage...........: ${_efl_enable_coverage}"
diff --git a/legacy/emotion/COPYING b/licenses/COPYING.SMALL
index aab8362..26d6208 100644
--- a/legacy/emotion/COPYING
+++ b/licenses/COPYING.SMALL
@@ -1,4 +1,4 @@
1Copyright notice for Emotion: 1Copyright notice for Embryo:
2 2
3Copyright (C) 2004-2011 Carsten Haitzler and various contributors (see AUTHORS) 3Copyright (C) 2004-2011 Carsten Haitzler and various contributors (see AUTHORS)
4 4
@@ -23,3 +23,25 @@ OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
23LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 23LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
24NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 24NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
25EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26
27Large parts of this source come under the following license from the
28original Small (renamed to Pawn afterwards, but was named Small when
29Embryo split off). See the source files that are clearly marked as below:
30
31Copyright (c) ITB CompuPhase, 1997-2003
32
33This software is provided "as-is", without any express or implied warranty.
34In no event will the authors be held liable for any damages arising from
35the use of this software.
36
37Permission is granted to anyone to use this software for any purpose,
38including commercial applications, and to alter it and redistribute it
39freely, subject to the following restrictions:
40
41 1. The origin of this software must not be misrepresented; you must not
42 claim that you wrote the original software. If you use this software in
43 a product, an acknowledgment in the product documentation would be
44 appreciated but is not required.
45 2. Altered source versions must be plainly marked as such, and must not be
46 misrepresented as being the original software.
47 3. This notice may not be removed or altered from any source distribution.
diff --git a/legacy/ecore/m4/check_x_extension.m4 b/m4/ecore_check_c_extension.m4
index a15120c..1ef3bd2 100644
--- a/legacy/ecore/m4/check_x_extension.m4
+++ b/m4/ecore_check_c_extension.m4
@@ -19,8 +19,8 @@ if test "x$5" != "xno"; then
19 UP[]_LIBS="-l$3" 19 UP[]_LIBS="-l$3"
20 use_[]DOWN="yes" 20 use_[]DOWN="yes"
21 ], 21 ],
22 [ use_[]DOWN="no" ], 22 [use_[]DOWN="no"],
23 [ $x_libs ] 23 [$x_libs]
24 ) 24 )
25 ], 25 ],
26 [ use_[]DOWN="no" ], 26 [ use_[]DOWN="no" ],
@@ -32,6 +32,8 @@ else
32 AC_MSG_NOTICE([$1 support disabled]) 32 AC_MSG_NOTICE([$1 support disabled])
33fi 33fi
34 34
35ECORE_X_LIBS="${ECORE_X_LIBS} ${UP[]_LIBS}"
36
35AC_SUBST(UP[]_CFLAGS) 37AC_SUBST(UP[]_CFLAGS)
36AC_SUBST(UP[]_LIBS) 38AC_SUBST(UP[]_LIBS)
37 39
diff --git a/legacy/ecore/m4/ecore_check_module.m4 b/m4/ecore_check_module.m4
index 01c4e0e..8d0d76b 100644
--- a/legacy/ecore/m4/ecore_check_module.m4
+++ b/m4/ecore_check_module.m4
@@ -73,14 +73,12 @@ AC_ARG_ENABLE(ecore-evas-$1,
73AC_MSG_CHECKING([whether ecore_evas $4 support is to be built]) 73AC_MSG_CHECKING([whether ecore_evas $4 support is to be built])
74AC_MSG_RESULT([${want_module}]) 74AC_MSG_RESULT([${want_module}])
75 75
76if test "x$5" = "xyes" && \ 76if test "x$2" = "xyes" && \
77 test "x$5" = "xyes" && \
77 test "x$have_ecore_evas" = "xyes" && \ 78 test "x$have_ecore_evas" = "xyes" && \
78 test "x$want_module" = "xyes" ; then 79 test "x$want_module" = "xyes" ; then
79 PKG_CHECK_EXISTS([evas-$2], 80 AC_DEFINE([BUILD_ECORE_EVAS_]m4_defn([UP]), [1], [Support for $4 Engine in Ecore_Evas])
80 [ 81 have_ecore_evas_[]m4_defn([DOWN])="yes"
81 AC_DEFINE([BUILD_ECORE_EVAS_]m4_defn([UP]), [1], [Support for $4 Engine in Ecore_Evas])
82 have_ecore_evas_[]m4_defn([DOWN])="yes"
83 ])
84fi 82fi
85 83
86AC_MSG_CHECKING([whether ecore_evas $4 support is built]) 84AC_MSG_CHECKING([whether ecore_evas $4 support is built])
diff --git a/m4/efl_check_libs.m4 b/m4/efl_check_libs.m4
index cbdb11b..c43e8d0 100644
--- a/m4/efl_check_libs.m4
+++ b/m4/efl_check_libs.m4
@@ -26,7 +26,6 @@ if test "x${have_dep}" = "xyes" ; then
26 [ 26 [
27 have_dep="yes" 27 have_dep="yes"
28 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ljpeg" 28 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ljpeg"
29 requirements_libs_deps_[]m4_defn([DOWNEFL])="${requirements_libs_deps_[]m4_defn([DOWNEFL])} -ljpeg"
30 ], 29 ],
31 [ 30 [
32 AC_MSG_ERROR("Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file") 31 AC_MSG_ERROR("Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file")
@@ -66,7 +65,6 @@ else
66 [ 65 [
67 _efl_have_lib="yes" 66 _efl_have_lib="yes"
68 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -lz" 67 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -lz"
69 requirements_libs_deps_[]m4_defn([DOWNEFL])="${requirements_libs_deps_[]m4_defn([DOWNEFL])} -lz"
70 ], 68 ],
71 [ 69 [
72 AC_MSG_ERROR(["Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file"]) 70 AC_MSG_ERROR(["Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file"])
diff --git a/m4/efl_threads.m4 b/m4/efl_threads.m4
index bba617f..a657500 100644
--- a/m4/efl_threads.m4
+++ b/m4/efl_threads.m4
@@ -28,15 +28,10 @@ case "$host_os" in
28 AC_DEFINE([EFL_HAVE_WIN32_THREADS], [1], [Define to mention that Win32 threads are supported]) 28 AC_DEFINE([EFL_HAVE_WIN32_THREADS], [1], [Define to mention that Win32 threads are supported])
29 AC_DEFINE([EFL_HAVE_THREADS], [1], [Define to mention that POSIX or Win32 threads are supported]) 29 AC_DEFINE([EFL_HAVE_THREADS], [1], [Define to mention that POSIX or Win32 threads are supported])
30 ;; 30 ;;
31 solaris*)
32 _efl_enable_posix_threads="yes"
33 _efl_threads_cflags="-mt"
34 _efl_threads_libs="-mt"
35 ;;
36 *) 31 *)
37 _efl_enable_posix_threads="yes" 32 _efl_enable_posix_threads="yes"
38 _efl_threads_cflags="-pthread" 33 _efl_threads_cflags="-D_REENTRANT"
39 _efl_threads_libs="-pthread" 34 _efl_threads_libs="-lpthread"
40 ;; 35 ;;
41esac 36esac
42 37
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index b380394..599cb33 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -51,7 +51,6 @@ fi
51 51
52if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 52if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
53 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" 53 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
54 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
55fi 54fi
56 55
57AC_SUBST([evas_engine_$1_cflags]) 56AC_SUBST([evas_engine_$1_cflags])
@@ -174,7 +173,6 @@ fi
174 173
175if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 174if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
176 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" 175 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
177 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
178fi 176fi
179 177
180AC_SUBST([evas_engine_$1_cflags]) 178AC_SUBST([evas_engine_$1_cflags])
@@ -346,7 +344,6 @@ fi
346 344
347if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 345if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
348 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" 346 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
349 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
350 requirements_pc_evas="${requirement} ${requirements_pc_evas}" 347 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
351 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" 348 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
352fi 349fi
@@ -376,7 +373,6 @@ AC_CHECK_HEADER([windows.h],
376 373
377if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 374if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
378 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" 375 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
379 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
380fi 376fi
381 377
382AC_SUBST([evas_engine_$1_cflags]) 378AC_SUBST([evas_engine_$1_cflags])
@@ -403,7 +399,6 @@ AC_CHECK_HEADER([ddraw.h],
403 399
404if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 400if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
405 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" 401 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
406 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
407fi 402fi
408 403
409AC_SUBST([evas_engine_$1_cflags]) 404AC_SUBST([evas_engine_$1_cflags])
@@ -430,7 +425,6 @@ AC_CHECK_HEADERS([d3d9.h d3dx9.h],
430 425
431if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 426if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
432 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" 427 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
433 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
434fi 428fi
435 429
436AC_SUBST([evas_engine_$1_cflags]) 430AC_SUBST([evas_engine_$1_cflags])
@@ -479,7 +473,6 @@ AC_LANG_POP([Objective C])
479 473
480if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 474if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
481 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" 475 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
482 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
483fi 476fi
484 477
485AC_SUBST([evas_engine_$1_cflags]) 478AC_SUBST([evas_engine_$1_cflags])
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
index 66cb980..5dc01d2 100644
--- a/m4/evas_check_loader.m4
+++ b/m4/evas_check_loader.m4
@@ -84,7 +84,6 @@ fi
84 84
85if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then 85if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
86 requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}" 86 requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
87 requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
88fi 87fi
89 88
90AC_SUBST([evas_image_loader_$1_cflags]) 89AC_SUBST([evas_image_loader_$1_cflags])
@@ -149,7 +148,6 @@ fi
149 148
150if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then 149if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
151 requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}" 150 requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
152 requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
153fi 151fi
154 152
155AC_SUBST([evas_image_loader_$1_cflags]) 153AC_SUBST([evas_image_loader_$1_cflags])
@@ -350,7 +348,6 @@ fi
350 348
351if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then 349if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
352 requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}" 350 requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
353 requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
354fi 351fi
355 352
356AC_SUBST([evas_image_loader_$1_cflags]) 353AC_SUBST([evas_image_loader_$1_cflags])
@@ -399,7 +396,6 @@ fi
399 396
400if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then 397if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
401 requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}" 398 requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
402 requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
403fi 399fi
404 400
405AC_SUBST([evas_image_loader_$1_cflags]) 401AC_SUBST([evas_image_loader_$1_cflags])
diff --git a/legacy/escape/ChangeLog b/old/ChangeLog.escape
index 8b13789..8b13789 100644
--- a/legacy/escape/ChangeLog
+++ b/old/ChangeLog.escape
diff --git a/old/NEWS.escape b/old/NEWS.escape
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/old/NEWS.escape
@@ -0,0 +1 @@
diff --git a/legacy/escape/README b/old/README.escape
index d45099f..d45099f 100644
--- a/legacy/escape/README
+++ b/old/README.escape
diff --git a/legacy/ecore/ecore-cocoa.pc.in b/pc/ecore-cocoa.pc.in
index 91fc4ee..fc36077 100644
--- a/legacy/ecore/ecore-cocoa.pc.in
+++ b/pc/ecore-cocoa.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-cocoa 6Name: ecore-cocoa
7Description: E core library, Cocoa module 7Description: E core library, Cocoa module
8@pkgconfig_requires_private@: @requirements_ecore_cocoa@ 8Requires.private: @requirements_pc_ecore_cocoa@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_cocoa 10Libs: -L${libdir} -lecore_cocoa
11Libs.private: @requirements_libs_ecore_cocoa@
11Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-con.pc.in b/pc/ecore-con.pc.in
index 9b188aa..ecf7b25 100644
--- a/legacy/ecore/ecore-con.pc.in
+++ b/pc/ecore-con.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-con 6Name: ecore-con
7Description: E core library, Con module 7Description: E core library, Con module
8@pkgconfig_requires_private@: @requirements_ecore_con@ 8Requires.private: @requirements_pc_ecore_con@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_con 10Libs: -L${libdir} -lecore_con
11Libs.private: @requirements_libs_ecore_con@
11Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-directfb.pc.in b/pc/ecore-directfb.pc.in
index 9eb104a..b02870b 100644
--- a/legacy/ecore/ecore-directfb.pc.in
+++ b/pc/ecore-directfb.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-directfb 6Name: ecore-directfb
7Description: E core library, DirectFB module 7Description: E core library, DirectFB module
8@pkgconfig_requires_private@: @requirements_ecore_directfb@ 8Requires.private: @requirements_pc_ecore_directfb@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_directfb 10Libs: -L${libdir} -lecore_directfb
11Libs.private: @requirements_libs_ecore_directfb@
11Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-evas.pc.in b/pc/ecore-evas.pc.in
index 155abbe..02a30ac 100644
--- a/legacy/ecore/ecore-evas.pc.in
+++ b/pc/ecore-evas.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-evas 6Name: ecore-evas
7Description: E core library, Evas module 7Description: E core library, Evas module
8@pkgconfig_requires_private@: @requirements_ecore_evas@ 8Requires.private: @requirements_pc_ecore_evas@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} @ecore_evas_libs@ 10Libs: -L${libdir} -lecore_evas
11Libs.private: @requirements_libs_ecore_evas@
11Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-fb.pc.in b/pc/ecore-fb.pc.in
index 4e70c48..f378816 100644
--- a/legacy/ecore/ecore-fb.pc.in
+++ b/pc/ecore-fb.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-fb 6Name: ecore-fb
7Description: E core library, FB module 7Description: E core library, FB module
8@pkgconfig_requires_private@: @requirements_ecore_fb@ 8Requires.private: @requirements_pc_ecore_fb@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_fb 10Libs: -L${libdir} -lecore_fb
11Libs.private: @requirements_libs_ecore_fb@
11Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-file.pc.in b/pc/ecore-file.pc.in
index 833ff1e..b0c210d 100644
--- a/legacy/ecore/ecore-file.pc.in
+++ b/pc/ecore-file.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-file 6Name: ecore-file
7Description: E core library, File module 7Description: E core library, File module
8@pkgconfig_requires_private@: @requirements_ecore_file@ 8Requires.private: @requirements_pc_ecore_file@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_file 10Libs: -L${libdir} -lecore_file
11Libs.private: @requirements_libs_ecore_file@
11Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-imf-evas.pc.in b/pc/ecore-imf-evas.pc.in
index 23451c8..23451c8 100644
--- a/legacy/ecore/ecore-imf-evas.pc.in
+++ b/pc/ecore-imf-evas.pc.in
diff --git a/legacy/ecore/ecore-imf.pc.in b/pc/ecore-imf.pc.in
index cc155ed..cc155ed 100644
--- a/legacy/ecore/ecore-imf.pc.in
+++ b/pc/ecore-imf.pc.in
diff --git a/legacy/ecore/ecore-input-evas.pc.in b/pc/ecore-input-evas.pc.in
index f95325c..39912d3 100644
--- a/legacy/ecore/ecore-input-evas.pc.in
+++ b/pc/ecore-input-evas.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-input-evas 6Name: ecore-input-evas
7Description: E core library, Input module Evas extension 7Description: E core library, Input module Evas extension
8@pkgconfig_requires_private@: @requirements_ecore_input_evas@ 8Requires.private: @requirements_pc_ecore_input_evas@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_input_evas 10Libs: -L${libdir} -lecore_input_evas
11Libs.private: @requirements_libs_ecore_input_evas@
11Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-input.pc.in b/pc/ecore-input.pc.in
index b670b71..4fc5d86 100644
--- a/legacy/ecore/ecore-input.pc.in
+++ b/pc/ecore-input.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-input 6Name: ecore-input
7Description: E core library, Input module 7Description: E core library, Input module
8@pkgconfig_requires_private@: @requirements_ecore_input@ 8Requires.private: @requirements_pc_ecore_input@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_input 10Libs: -L${libdir} -lecore_input
11Libs.private: @requirements_libs_ecore_input@
11Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-ipc.pc.in b/pc/ecore-ipc.pc.in
index d66f404..541de21 100644
--- a/legacy/ecore/ecore-ipc.pc.in
+++ b/pc/ecore-ipc.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-ipc 6Name: ecore-ipc
7Description: E core library, IPC module 7Description: E core library, IPC module
8@pkgconfig_requires_private@: @requirements_ecore_ipc@ 8Requires.private: @requirements_pc_ecore_ipc@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_ipc 10Libs: -L${libdir} -lecore_ipc
11Libs.private: @requirements_libs_ecore_ipc@
11Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-psl1ght.pc.in b/pc/ecore-psl1ght.pc.in
index e81f4e8..0b53362 100644
--- a/legacy/ecore/ecore-psl1ght.pc.in
+++ b/pc/ecore-psl1ght.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-psl1ght 6Name: ecore-psl1ght
7Description: E core library, PSL1GHT module 7Description: E core library, PSL1GHT module
8@pkgconfig_requires_private@: @requirements_ecore_psl1ght@ 8Requires.private: @requirements_pc_ecore_psl1ght@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_psl1ght 10Libs: -L${libdir} -lecore_psl1ght
11Libs.private: -lio -lsysutil -lgem -lcamera -lspurs 11Libs.private: @requirements_libs_ecore_psl1ght@
12Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-sdl.pc.in b/pc/ecore-sdl.pc.in
index 78170c1..78170c1 100644
--- a/legacy/ecore/ecore-sdl.pc.in
+++ b/pc/ecore-sdl.pc.in
diff --git a/legacy/ecore/ecore-wayland.pc.in b/pc/ecore-wayland.pc.in
index f4f5cf3..5a123cf 100644
--- a/legacy/ecore/ecore-wayland.pc.in
+++ b/pc/ecore-wayland.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-wayland 6Name: ecore-wayland
7Description: E core library, Wayland module 7Description: E core library, Wayland module
8@pkgconfig_requires_private@: @requirements_ecore_wayland@ 8Requires.private: @requirements_pc_ecore_wayland@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_wayland 10Libs: -L${libdir} -lecore_wayland
11Libs.private: -lwayland-client 11Libs.private: @requirements_libs_ecore_wayland@
12Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-win32.pc.in b/pc/ecore-win32.pc.in
index ac5ab32..09383d6 100644
--- a/legacy/ecore/ecore-win32.pc.in
+++ b/pc/ecore-win32.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-win32 6Name: ecore-win32
7Description: E core library, Win32 module 7Description: E core library, Win32 module
8@pkgconfig_requires_private@: @requirements_ecore_win32@ 8Requires.private: @requirements_pc_ecore_win32@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_win32 10Libs: -L${libdir} -lecore_win32
11Libs.private: @WIN32_LIBS@ 11Libs.private: @requirements_libs_ecore_win32@
12Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-wince.pc.in b/pc/ecore-wince.pc.in
index c937e88..344f29a 100644
--- a/legacy/ecore/ecore-wince.pc.in
+++ b/pc/ecore-wince.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-wince 6Name: ecore-wince
7Description: E core library, WinCE module 7Description: E core library, WinCE module
8@pkgconfig_requires_private@: @requirements_ecore_wince@ 8Requires.private: @requirements_pc_ecore_wince@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_wince 10Libs: -L${libdir} -lecore_wince
11Libs.private: @WIN32_LIBS@ 11Libs.private: @requirements_libs_ecore_wince@
12Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-x.pc.in b/pc/ecore-x.pc.in
index a02b42b..ec7fae7 100644
--- a/legacy/ecore/ecore-x.pc.in
+++ b/pc/ecore-x.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore-x 6Name: ecore-x
7Description: E core library, X module 7Description: E core library, X module
8@pkgconfig_requires_private@: @requirements_ecore_x@ 8Requires.private: @requirements_pc_ecore_x@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_x 10Libs: -L${libdir} -lecore_x
11Libs.private: @x_libs@ @ecore_x_libs_private@ 11Libs.private: @requirements_libs_ecore_x@
12Cflags: -I${includedir}/ecore-@VMAJ@ @have_ecore_x_xcb_define@ 12Cflags: -I${includedir}/ecore-@VMAJ@ @have_ecore_x_xcb_define@
diff --git a/legacy/ecore/ecore.pc.in b/pc/ecore.pc.in
index db67e7a..f141c4c 100644
--- a/legacy/ecore/ecore.pc.in
+++ b/pc/ecore.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
5 5
6Name: ecore 6Name: ecore
7Description: Ecore event abstraction library 7Description: Ecore event abstraction library
8@pkgconfig_requires_private@: @requirements_ecore@ 8Requires.private: @requirements_pc_ecore@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore @EINA_LIBS@ 10Libs: -L${libdir} -lecore
11Libs.private: -lm 11Libs.private: @requirements_libs_ecore@ -lm
12Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/escape/escape.pc.in b/pc/escape.pc.in
index 5d18d80..5d18d80 100644
--- a/legacy/escape/escape.pc.in
+++ b/pc/escape.pc.in
diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/po/ChangeLog
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..3ea2f05
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,2 @@
1cs de el es fr gl it ko nl pt sl
2
diff --git a/legacy/ecore/po/Makevars b/po/Makevars
index 22837ab..22837ab 100644
--- a/legacy/ecore/po/Makevars
+++ b/po/Makevars
diff --git a/legacy/ecore/po/POTFILES.in b/po/POTFILES.in
index 5014aa2..5014aa2 100644
--- a/legacy/ecore/po/POTFILES.in
+++ b/po/POTFILES.in
diff --git a/legacy/ecore/po/cs.po b/po/cs.po
index db049a6..4aa405d 100644
--- a/legacy/ecore/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
5msgstr "" 5msgstr ""
6"Project-Id-Version: ecore\n" 6"Project-Id-Version: ecore\n"
7"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" 7"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
8"POT-Creation-Date: 2012-10-16 11:52+0900\n" 8"POT-Creation-Date: 2012-11-21 13:41+0100\n"
9"PO-Revision-Date: 2011-10-23 01:28+0100\n" 9"PO-Revision-Date: 2011-10-23 01:28+0100\n"
10"Last-Translator: Daniel Kolesa <quaker66@gmail.com>\n" 10"Last-Translator: Daniel Kolesa <quaker66@gmail.com>\n"
11"Language-Team: Czech <kde-i18n-doc@kde.org>\n" 11"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -16,159 +16,159 @@ msgstr ""
16"X-Generator: Lokalize 1.2\n" 16"X-Generator: Lokalize 1.2\n"
17"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" 17"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
18 18
19#: src/lib/ecore/ecore_getopt.c:95 19#: src/lib/ecore/ecore_getopt.c:104
20msgid "Version:" 20msgid "Version:"
21msgstr "Verze:" 21msgstr "Verze:"
22 22
23#: src/lib/ecore/ecore_getopt.c:104 23#: src/lib/ecore/ecore_getopt.c:113
24msgid "Usage:" 24msgid "Usage:"
25msgstr "Použití:" 25msgstr "Použití:"
26 26
27#: src/lib/ecore/ecore_getopt.c:109 27#: src/lib/ecore/ecore_getopt.c:118
28#, c-format 28#, c-format
29msgid "%s [options]\n" 29msgid "%s [options]\n"
30msgstr "%s [volby]\n" 30