From f697cb23f907b93d556e5857ca1aa02dd65a5cea Mon Sep 17 00:00:00 2001 From: caro Date: Fri, 13 Mar 2009 16:35:16 +0000 Subject: [PATCH] * update configure.ac so that default options are chosen according to the host * fix requirements * fix configuration on mac os x (problem with automake 1.9) and add missing values/macro for quartz support * small typo in ecore_evas_win32 api * use m4 api in m4 files git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@39471 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 1350 ++++++++++++++++--------------- ecore-con.pc.in | 2 +- ecore-config.pc.in | 2 +- ecore-directfb.pc.in | 2 +- ecore-evas.pc.in | 2 +- ecore-fb.pc.in | 2 +- ecore-file.pc.in | 2 +- ecore-imf-evas.pc.in | 2 +- ecore-imf.pc.in | 2 +- ecore-ipc.pc.in | 2 +- ecore-job.pc.in | 2 +- ecore-quartz.pc.in | 2 +- ecore-sdl.pc.in | 2 +- ecore-win32.pc.in | 1 + ecore-wince.pc.in | 1 + ecore.pc.in | 2 +- m4/ecore_check_module.m4 | 140 ++-- m4/ecore_check_options.m4 | 212 +++++ src/lib/ecore/Makefile.am | 2 +- src/lib/ecore_evas/Ecore_Evas.h | 8 +- src/lib/ecore_evas/Makefile.am | 5 +- src/lib/ecore_evas/ecore_evas.c | 18 +- src/lib/ecore_evas/ecore_evas_buffer.c | 8 +- src/lib/ecore_evas/ecore_evas_private.h | 6 +- src/lib/ecore_evas/ecore_evas_quartz.c | 2 +- src/lib/ecore_evas/ecore_evas_sdl.c | 8 +- src/lib/ecore_file/Makefile.am | 1 + src/lib/ecore_imf/Makefile.am | 1 + src/lib/ecore_imf_evas/Makefile.am | 1 + src/lib/ecore_job/Makefile.am | 1 + src/lib/ecore_quartz/Makefile.am | 16 +- src/lib/ecore_sdl/Makefile.am | 1 + src/lib/ecore_txt/Makefile.am | 1 + src/lib/ecore_win32/Makefile.am | 1 + src/lib/ecore_wince/Makefile.am | 1 + src/lib/ecore_x/xlib/Makefile.am | 4 +- 36 files changed, 1025 insertions(+), 790 deletions(-) create mode 100644 m4/ecore_check_options.m4 diff --git a/configure.ac b/configure.ac index d9abf29..1ee30f2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,10 @@ # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT(ecore, 0.9.9.050, enlightenment-devel@lists.sourceforge.net) -AC_PREREQ(2.52) -AC_CONFIG_SRCDIR(configure.ac) +AC_INIT([ecore], [0.9.9.050], [enlightenment-devel@lists.sourceforge.net]) +AC_PREREQ([2.52]) +AC_CONFIG_SRCDIR([configure.ac]) +AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX @@ -11,27 +12,9 @@ AC_ISC_POSIX AM_INIT_AUTOMAKE(1.6 dist-bzip2) AM_CONFIG_HEADER(config.h) -AC_PROG_CXX -AC_C_BIGENDIAN -AC_PROG_CC -AM_PROG_CC_STDC -m4_ifdef([AC_PROG_OBJC], - [AC_PROG_OBJC], - [AC_CHECK_TOOL([OBJC], [gcc]) - AC_SUBST([OBJC]) - AC_SUBST([OBJCFLAGS]) - ]) -AC_HEADER_STDC -AC_C_CONST -AC_CHECK_SIZEOF(int, 4) -AC_CHECK_SIZEOF(long, 4) -AC_C___ATTRIBUTE__ -AC_HEADER_SYS_WAIT - AC_LIBTOOL_WIN32_DLL define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl AC_PROG_LIBTOOL -AC_DEFINE_UNQUOTED(SHARED_LIB_SUFFIX, "$shrext_cmds", [Suffix for shared objects]) VMAJ=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $1);}'` VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'` @@ -40,226 +23,307 @@ SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'` version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN" AC_SUBST(version_info) -# define pkg-config requirements for all our submodules. -# only the trivial requirements go here. +AC_DEFINE_UNQUOTED(SHARED_LIB_SUFFIX, "$shrext_cmds", [Suffix for shared objects]) + + +### Default options with respect to host + +# dependencies and options +want_curl="no" +want_abstract_sockets="no" +want_gnutls="no" +want_openssl="no" +want_cipher="no" +want_signature="no" +want_poll="yes" +want_inotify="no" +want_tslib="no" + +# core modules +want_ecore_job="yes" +want_ecore_txt="yes" +want_ecore_con="no" +want_ecore_ipc="no" +want_ecore_file="yes" +want_ecore_config="no" +want_ecore_imf="no" + +# graphic system modules +want_evas_simple_x11="no" +want_ecore_x_xcb="no" +want_ecore_x="no" +want_ecore_win32="no" +want_ecore_quartz="no" +want_ecore_sdl="no" +want_ecore_fb="no" +want_ecore_directfb="no" +want_ecore_wince="no" + +# ecore_evas modules +want_ecore_evas="yes" +want_ecore_evas_software_buffer="yes" +want_ecore_evas_software_x11="no" +want_ecore_evas_xrender_x11="no" +want_ecore_evas_opengl_x11="no" +want_ecore_evas_software_16_x11="no" +want_ecore_evas_software_xcb="no" +want_ecore_evas_xrender_xcb="no" +want_ecore_evas_software_ddraw="no" +want_ecore_evas_direct3d="no" +want_ecore_evas_opengl_glew="no" +want_ecore_evas_software_16_ddraw="no" +want_ecore_evas_quartz="no" +want_ecore_evas_software_sdl="no" +want_ecore_evas_directfb="no" +want_ecore_evas_fb="no" +want_ecore_evas_software_16_wince="no" + +case "$host_os" in + mingw32ce* | cegcc*) + want_ecore_wince="yes" + want_ecore_evas_software_16_wince="yes" + ;; + mingw*) + want_curl="yes" + want_ecore_imf="yes" + want_ecore_win32="yes" + want_ecore_evas_software_ddraw="yes" + want_ecore_evas_direct3d="yes" + want_ecore_evas_opengl_glew="yes" + want_ecore_evas_software_16_ddraw="auto" + want_ecore_evas_software_sdl="yes" + ;; + darwin*) + want_curl="yes" + want_gnutls="auto" + want_openssl="auto" + want_ecore_con="yes" + want_ecore_ipc="yes" + want_ecore_config="yes" + want_ecore_imf="yes" + want_ecore_quartz="yes" + want_ecore_evas_quartz="yes" + want_ecore_evas_software_sdl="yes" + ;; + *) + want_curl="yes" + want_abstract_sockets="yes" + want_gnutls="auto" + want_openssl="auto" + want_cipher="yes" + want_signature="yes" + want_inotify="yes" + want_tslib="yes" + want_ecore_con="yes" + want_ecore_ipc="yes" + want_ecore_config="yes" + want_ecore_imf="yes" + want_ecore_x="yes" + want_ecore_evas_software_x11="yes" + want_ecore_evas_xrender_x11="yes" + want_ecore_evas_opengl_x11="yes" + want_ecore_evas_software_16_x11="yes" + want_ecore_evas_software_xcb="yes" + want_ecore_evas_xrender_xcb="yes" + want_ecore_evas_software_sdl="yes" + want_ecore_evas_directfb="yes" + want_ecore_evas_fb="yes" + ;; +esac + +requirements_ecore="" requirements_ecore_con="" requirements_ecore_config="" requirements_ecore_directfb="" -requirements_ecore_evas="evas" +requirements_ecore_evas="" requirements_ecore_fb="" requirements_ecore_file="" +requirements_ecore_imf="" +requirements_ecore_imf_evas="" requirements_ecore_ipc="" requirements_ecore_job="" +requirements_ecore_quartz="" +requirements_ecore_sdl="" requirements_ecore_txt="" requirements_ecore_x="" requirements_ecore_win32="" requirements_ecore_wince="" -requirements_ecore_sdl="" -requirements_ecore_quartz="" -dnl The first call to PKG_CHECK_MODULES is done conditionally, -dnl so we should include this here: -PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES([EINA], [eina-0]) +### Additional options to configure -dnl add windows requirements -WIN32_CPPFLAGS="" -WIN32_CFLAGS="" -WIN32_LIBS="" -lt_enable_auto_import="" -case "$host_os" in - mingw* | cegcc*) - PKG_CHECK_MODULES([EVIL], [evil]) - AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.]) - dnl needed for correct definition of EAPI - AC_DEFINE(EFL_ECORE_BUILD, 1, [Define to mention that ecore is built.]) - AC_DEFINE(EFL_ECORE_EVAS_BUILD, 1, [Define to mention that ecore evas is built.]) - AC_DEFINE(EFL_ECORE_FILE_BUILD, 1, [Define to mention that ecore file is built.]) - AC_DEFINE(EFL_ECORE_IMF_BUILD, 1, [Define to mention that ecore imf is built.]) - AC_DEFINE(EFL_ECORE_JOB_BUILD, 1, [Define to mention that ecore job is built.]) - AC_DEFINE(EFL_ECORE_SDL_BUILD, 1, [Define to mention that ecore SDL is built.]) - AC_DEFINE(EFL_ECORE_QUARTZ_BUILD, 1, [Define to mention that ecore Quartz is built.]) - AC_DEFINE(EFL_ECORE_TXT_BUILD, 1, [Define to mention that ecore txt is built.]) - AC_DEFINE(EFL_ECORE_WIN32_BUILD, 1, [Define to mention that ecore Win32 is built.]) - AC_DEFINE(HAVE_DLFCN_H, 1, [Define to 1 if you have the header file.]) - AC_DEFINE(HAVE_SYS_MMAN_H, 1, [Define to 1 if you have the header file.]) - AC_DEFINE(HAVE_SYS_TIME_H, 1, [Define to 1 if you have the header file.]) - if test "$host_os" = "cegcc" ; then - AC_DEFINE(EFL_ECORE_WINCE_BUILD, 1, [Define to mention that ecore WinCE is built.]) - WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420" - WIN32_CFLAGS="-mwin32" - WIN32_LIBS="-lws2" - else - if test "$host_os" = "mingw32ce" ; then - AC_DEFINE(EFL_ECORE_WINCE_BUILD, 1, [Define to mention that ecore WinCE is built.]) - WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420" - WIN32_LIBS="-lws2" - else - WIN32_LIBS="-lws2_32" - fi - fi - lt_enable_auto_import="-Wl,--enable-auto-import" - dlopen_libs=-ldl - ;; - *) - AC_CHECK_HEADERS([dlfcn.h features.h langinfo.h locale.h netdb.h netinet/in.h sys/time.h sys/mman.h signal.h sys/resource.h]) - AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) - ;; -esac -AC_SUBST(dlopen_libs) -AC_SUBST(WIN32_CPPFLAGS) -AC_SUBST(WIN32_CFLAGS) -AC_SUBST(WIN32_LIBS) -AC_SUBST(lt_enable_auto_import) +# abstract sockets (ecore_con.c) +AC_ARG_ENABLE([abstract-sockets], + [AC_HELP_STRING([--disable-abstract-sockets], [disable abstract sockets.])], + [ + if test "x${enableval}" = "xyes" ; then + want_abstract_sockets="yes" + else + want_abstract_sockets="no" + fi + ], + [want_abstract_sockets="yes"]) -dnl check common functions and headers -AC_CHECK_FUNCS(gettimeofday) -AC_CHECK_FUNCS(strlcpy) -AC_FUNC_ALLOCA +if test "x${want_abstract_sockets}" = "xyes" ; then + AC_DEFINE([HAVE_ABSTRACT_SOCKETS], [1], [Have abstract sockets namespace]) +fi -dnl gnutls -want_gnutls="yes" -have_gnutls="no" -AC_ARG_ENABLE(gnutls, - AC_HELP_STRING( - [--disable-gnutls], - [disable gnutls support] - ), - [ want_gnutls=$enableval ] -) +# Simple X11 build/link -if test "x$want_gnutls" = "xyes"; then - PKG_CHECK_MODULES([TLS2], [gnutls >= 2.0.0], [ - AC_DEFINE(USE_GNUTLS2, 1, [Use GnuTLS 2 or higher]) - have_gnutls2="yes" - ], [ - have_gnutls2="no" - ]) - PKG_CHECK_MODULES([TLS], [gnutls], [ - AC_DEFINE(USE_GNUTLS, 1, [Use GnuTLS]) - requirements_ecore_con="$requirements_ecore_con gnutls" - # no need to add it to req_ecore_ipc, since they - # depends on ecore_con anyway. - have_gnutls="yes" - ], [ - have_gnutls="no" - ]) -fi +AC_ARG_ENABLE(simple-x11, + AC_HELP_STRING([--enable-simple-x11], [enable simple x11 linking]), + [want_evas_simple_x11=$enableval]) -dnl openssl -want_openssl="yes" -have_openssl="no" -AC_ARG_ENABLE(openssl, - AC_HELP_STRING( - [--disable-openssl], - [disable openssl support] - ), - [ want_openssl=$enableval ] -) -if test "x$want_openssl" = "xyes"; then - PKG_CHECK_MODULES([SSL], [openssl], [ - AC_DEFINE(USE_OPENSSL, 1, [Use OpenSSL]) - requirements_ecore_con="$requirements_ecore_con openssl" - # no need to add it to req_ecore_ipc, since they - # depends on ecore_con anyway. - have_openssl="yes" - ], [ - have_openssl="no" - ]) -fi +### Checks for programs -dnl curl -want_curl="yes" -have_curl="no" -AC_ARG_ENABLE(curl, - AC_HELP_STRING( - [--disable-curl], - [disable curl support] - ), - [ want_curl=$enableval ] -) +m4_ifdef([AC_PROG_OBJC], + [ + AC_PROG_OBJC + _AM_DEPENDENCIES(OBJC) + ], + [ + AC_CHECK_TOOL([OBJC], [gcc]) + AC_SUBST([OBJC]) + AC_SUBST([OBJCFLAGS]) + ]) +AC_PROG_CXX +AC_PROG_CC -if test "x$want_curl" = "xyes"; then - PKG_CHECK_MODULES(CURL, libcurl, - [ - AC_DEFINE(HAVE_CURL, 1, [ Downloading with CURL ]) - requirements_ecore_con="$requirements_ecore_con libcurl" - have_curl="yes" - ], - [ have_curl="no" ] - ) -fi +# doxygen program for documentation building -dnl abstract sockets -want_abstract_sockets="yes" -AC_ARG_ENABLE(abstract-sockets, - AC_HELP_STRING( - [--disable-abstract-sockets], - [disable abstract sockets.] - ), - [ want_abstract_sockets=$enableval ] -) -if test "x$want_abstract_sockets" = "xyes"; then - AC_DEFINE(HAVE_ABSTRACT_SOCKETS, 1, [Have abstract sockets namespace]) -fi +EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) -dnl ecore_job -ECORE_CHECK_MODULE([Job], [yes]) +# The first call to PKG_CHECK_MODULES is done conditionally, +# so we should include this here: +PKG_PROG_PKG_CONFIG -dnl ecore_con -ECORE_CHECK_MODULE([Con], [yes]) -dnl ecore_ipc -ECORE_CHECK_MODULE([Ipc], [yes], [$have_ecore_con]) +### Checks for libraries -dnl ecore_config -PKG_CHECK_MODULES(EET, [eet >= 1.0.0], - [ have_eet="yes" ], - [ have_eet="no" ] -) -ecore_config_deps="no" -if test "x$have_eet" = "xyes" -a "x$have_ecore_ipc" = "xyes" ; then - ecore_config_deps="yes" -fi -ECORE_CHECK_MODULE([Config], [yes], [$ecore_config_deps], - [requirements_ecore_config="$requirements_ecore_config ecore-ipc eet"]) +# Evil library for compilation on Windows + +case "$host_os" in + mingw* | cegcc*) + PKG_CHECK_MODULES([EVIL], [evil]) + AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed]) + requirements_ecore="evil ${requirements_ecore}" + requirements_ecore_evas="evil ${requirements_ecore_evas}" + requirements_ecore_file="evil ${requirements_ecore_file}" + requirements_ecore_imf="evil ${requirements_ecore_imf}" + requirements_ecore_imf_evas="evil ${requirements_ecore_imf_evas}" + requirements_ecore_job="evil ${requirements_ecore_job}" + requirements_ecore_txt="evil ${requirements_ecore_txt}" + EFL_ECORE_BUILD="-DEFL_ECORE_BUILD" + EFL_ECORE_JOB_BUILD="-DEFL_ECORE_JOB_BUILD" + EFL_ECORE_TXT_BUILD="-DEFL_ECORE_TXT_BUILD" + EFL_ECORE_FILE_BUILD="-DEFL_ECORE_FILE_BUILD" + EFL_ECORE_EVAS_BUILD="-DEFL_ECORE_EVAS_BUILD" + EFL_ECORE_IMF_BUILD="-DEFL_ECORE_IMF_BUILD" + ;; +esac + +have_win32="" +have_wince="" +case "$host_os" in + mingw32ce* | cegcc*) + EFL_ECORE_WINCE_BUILD="-DEFL_ECORE_WINCE_BUILD" + requirements_ecore_wince="evil ${requirements_ecore_wince}" + have_wince="yes" + ;; + mingw*) + EFL_ECORE_WIN32_BUILD="-DEFL_ECORE_WIN32_BUILD" + EFL_ECORE_SDL_BUILD="-DEFL_ECORE_SDL_BUILD" + requirements_ecore_win32="evil ${requirements_ecore_win32}" + requirements_ecore_sdl="evil ${requirements_ecore_sdl}" + have_win32="yes" + ;; +esac + +AC_SUBST(EFL_ECORE_BUILD) +AC_SUBST(EFL_ECORE_JOB_BUILD) +AC_SUBST(EFL_ECORE_TXT_BUILD) +AC_SUBST(EFL_ECORE_FILE_BUILD) +AC_SUBST(EFL_ECORE_EVAS_BUILD) +AC_SUBST(EFL_ECORE_IMF_BUILD) +AC_SUBST(EFL_ECORE_WINCE_BUILD) +AC_SUBST(EFL_ECORE_WIN32_BUILD) +AC_SUBST(EFL_ECORE_SDL_BUILD) + +AM_CONDITIONAL(ECORE_HAVE_WINCE, test "x${have_wince}" = "xyes") +AM_CONDITIONAL(ECORE_HAVE_WIN32, test "x${have_win32}" = "xyes") + +WIN32_LIBS="" +case "$host_os" in + mingw32ce* | cegcc*) + WIN32_LIBS="-lws2" + dlopen_libs="-ldl" + ;; + mingw*) + WIN32_LIBS="-lws2_32" + dlopen_libs="-ldl" + ;; + *) + AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) + ;; +esac +AC_SUBST(WIN32_LIBS) +AC_SUBST(dlopen_libs) + +# Eina library + +PKG_CHECK_MODULES(EINA, [eina-0]) +#FIXME check all the requirements when the eina move will be finished +requirements_ecore="eina-0 ${requirements_ecore}" +requirements_ecore_con="ecore eina-0 ${requirements_ecore_con}" +requirements_ecore_config="ecore eina-0 ${requirements_ecore_config}" +requirements_ecore_directfb="ecore eina-0 ${requirements_ecore_directfb}" +requirements_ecore_evas="ecore eina-0 ${requirements_ecore_evas}" +requirements_ecore_fb="ecore eina-0 ${requirements_ecore_fb}" +requirements_ecore_file="ecore eina-0 ${requirements_ecore_file}" +requirements_ecore_imf="ecore eina-0 ${requirements_ecore_imf}" +requirements_ecore_imf_evas="ecore eina-0 ${requirements_ecore_imf_evas}" +requirements_ecore_ipc="ecore eina-0 ${requirements_ecore_ipc}" +requirements_ecore_job="ecore eina-0 ${requirements_ecore_job}" +requirements_ecore_quartz="ecore eina-0 ${requirements_ecore_quartz}" +requirements_ecore_sdl="ecore eina-0 ${requirements_ecore_sdl}" +requirements_ecore_x="ecore eina-0 ${requirements_ecore_x}" +requirements_ecore_win32="ecore eina-0 ${requirements_ecore_win32}" +requirements_ecore_wince="ecore eina-0 ${requirements_ecore_wince}" + + +# iconv library (ecore_txt) -dnl ecore_txt iconv_cflags="" iconv_libs="" have_iconv="no" -AC_ARG_WITH(iconv-link, - AC_HELP_STRING([--with-iconv-link=ICONV_LINK], [explicitly specify an iconv link option]), - [ +AC_ARG_WITH([iconv-link], + AC_HELP_STRING([--with-iconv-link=ICONV_LINK], [explicitly specify an iconv link option]), + [ iconv_libs=$withval have_iconv="yes" - ] + ] ) -if test "x$have_iconv" = "xno" ; then - AC_CHECK_LIB(c, iconv, - [ have_iconv="yes" ] - ) +if test "x${have_iconv}" = "xno" ; then + AC_CHECK_LIB(c, iconv, + [have_iconv="yes"] ) - if test "x$have_iconv" != "xyes"; then - AC_CHECK_LIB(iconv, iconv, - [ - iconv_libs="-liconv" - have_iconv="yes" - ] - ) - fi + if ! test "x${have_iconv}" = "xyes" ; then + AC_CHECK_LIB(iconv, iconv, + [ + iconv_libs="-liconv" + have_iconv="yes" + ]) + fi - if test "x$have_iconv" != "xyes"; then - AC_CHECK_LIB(iconv_plug, iconv, - [ - iconv_libs="-liconv -liconv_plug" - have_iconv="yes" - ] - ) - fi + if test "x$have_iconv" != "xyes"; then + AC_CHECK_LIB(iconv_plug, iconv, + [ + iconv_libs="-liconv -liconv_plug" + have_iconv="yes" + ]) + fi fi AC_MSG_CHECKING(for explicit iconv link options) AC_MSG_RESULT($iconv_libs) @@ -267,24 +331,54 @@ AC_MSG_RESULT($iconv_libs) AC_SUBST(iconv_cflags) AC_SUBST(iconv_libs) -ECORE_CHECK_MODULE([Txt], [yes], [$have_iconv], - [ecore_txt_libs="$ecore_txt_libs $iconv_libs"]) -dnl ecore_evas -PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9], - [ have_evas="yes" ], - [ have_evas="no" ] -) +# SDL library (ecore_sdl) -ECORE_CHECK_MODULE([Evas], [yes], [$have_evas]) +have_sdl="no" +SDL_CONFIG="sdl-config" +AC_ARG_WITH([sdl-config], + [AC_HELP_STRING([--with-sdl-config=PATH], [use sdl-config specified])], + [ + SDL_CONFIG=$withval + AC_MSG_NOTICE([using ${SDL_CONFIG} for sdl-config]) + ]) + +AC_PATH_PROG([SDL_CONFIG], ["sdl-config"], [""], [$PATH]) + +if test -z "$SDL_CONFIG" ; then + SDL_CFLAGS=`$SDL_CONFIG --cflags` + SDL_LIBS=`$SDL_CONFIG --libs` + AC_SUBST(SDL_CFLAGS) + AC_SUBST(SDL_LIBS) + have_sdl="no" +else + PKG_CHECK_MODULES([SDL], [sdl >= 1.2.0], [have_sdl="yes"]) +fi -####################################### -## Simple X11 build/link +if test "x${have_sdl}" = "xyes" ; then + PKG_CHECK_EXISTS([sdl >= 1.3.0], + [AC_DEFINE(BUILD_ECORE_EVAS_SDL_130, 1, [Support for SVN SDL])]) +fi + + +# DirectFB library (ecore_directfb) + +PKG_CHECK_MODULES([DIRECTFB], [directfb >= 0.9.16], + [ + have_directfb="yes" + requirements_ecore_directfb="evas ${requirements_ecore_directfb}" + ], + [have_directfb="no"]) + + +# Eet library (ecore_config) + +PKG_CHECK_MODULES(EET, [eet >= 1.0.0], + [ have_eet="yes" ], + [ have_eet="no" ]) -AC_ARG_ENABLE(simple-x11, - AC_HELP_STRING([--enable-simple-x11], [enable simple x11 linking]), - [ want_evas_simple_x11=$enableval ] -) + +# Xlib and XCB (ecore_x) have_x="no" have_ecore_x="no" @@ -296,14 +390,11 @@ x_includes=""; x_cflags=""; x_libs=""; -dnl ecore_x{cb} - AC_ARG_ENABLE(ecore-x-xcb, - AC_HELP_STRING( - [--enable-ecore-x-xcb], - [enable the ecore_x module with XCB backend. [[default=disabled]]]), - [ want_ecore_x_xcb=$enableval ], - [ want_ecore_x_xcb="no" ]) + [AC_HELP_STRING([--enable-ecore-x-xcb], + [enable the ecore_x module with XCB backend. [[default=disabled]]])], + [want_ecore_x_xcb=$enableval], + [want_ecore_x_xcb="no"]) AC_MSG_CHECKING(whether ecore_x with XCB backend is to be built) AC_MSG_RESULT($want_ecore_x_xcb) @@ -435,40 +526,7 @@ if ! test "x$have_ecore_x_xcb" = "xyes" ; then AC_SUBST(Xcursor_cflags) AC_SUBST(Xcursor_libs) - Xkb_libs="" - Xkb_cflags="" - use_Xkb="no" - PCFLAGS=$CFLAGS - CFLAGS="$x_cflags $x_includes" - AC_CHECK_HEADER(X11/XKBlib.h, - [ - AC_CHECK_LIB(X11, XkbSetDetectableAutoRepeat, - [ - AC_DEFINE(ECORE_XKB, 1, [Build support for Xkb]) - Xkb_cflags="" - Xkb_libs="" - use_Xkb="yes" - ], [ - Xkb_cflags="" - Xkb_libs="" - use_Xkb="no" - ], [ - $x_libs - ] - ) - ], [ - Xkb_cflags="" - Xkb_libs="" - use_Xkb="no" - ], [ - #include - ] - ) - CFLAGS=$PCFLAGS - - AC_SUBST(Xkb_cflags) - AC_SUBST(Xkb_libs) - + ECORE_CHECK_X_EXTENSION([Xkb], [XKB.h], [X11], [XkbSetDetectableAutoRepeat]) ECORE_CHECK_X_EXTENSION([Xcomposite], [Xcomposite.h], [Xcomposite], [XCompositeQueryExtension]) ECORE_CHECK_X_EXTENSION([Xdamage], [Xdamage.h], [Xdamage], [XDamageSubtract]) ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xdpms], [DPMSQueryExtension]) @@ -494,462 +552,401 @@ AC_SUBST(x_cflags) AC_SUBST(x_includes) AC_SUBST(x_libs) -ECORE_CHECK_MODULE([X], [yes], [$have_x], - [ecore_x_libs="$ecore_x_libs $x_libs"]) +AM_CONDITIONAL(BUILD_ECORE_X_XLIB, test $have_ecore_x_xlib = yes) +AM_CONDITIONAL(BUILD_ECORE_X_XCB, test $have_ecore_x_xcb = yes) -dnl ecore_evas_x11 -have_ecore_evas_software_x11="no" -have_ecore_evas_xrender_x11="no"; -have_ecore_evas_opengl_x11="no"; -have_ecore_evas_software_xcb="no" -have_ecore_evas_xrender_xcb="no"; -have_ecore_evas_software_16_x11="no"; -if test "x$have_ecore_x" = "xyes" -a "x$have_ecore_evas" = "xyes"; then - dnl ecore_evas_x Xlib - if test "x$have_ecore_x_xlib" = "xyes"; then - want_ecore_evas_software_x11="yes" - dnl disabling this will make things go haywire - #AC_ARG_ENABLE(ecore-evas-x11, - # AC_HELP_STRING( - # [--enable-ecore-evas-x11], - # [enable X11 support in the ecore_evas module.] - # ), - # [ want_ecore_evas_x11=$enableval ] - #) - AC_MSG_CHECKING(whether ecore_evas Software Xlib support is to be built) - AC_MSG_RESULT($want_ecore_evas_software_x11) - - if test "x$want_ecore_evas_software_x11" = "xyes"; then - PKG_CHECK_MODULES(EVAS_SOFTWARE_X11, evas-software-x11, [ - AC_DEFINE(BUILD_ECORE_EVAS_SOFTWARE_X11, 1, [Support for Software Xlib Engine in Ecore_Evas]) - have_ecore_evas_software_x11="yes"; - ], [ - have_ecore_evas_software_x11="no"; - ]) - fi +# Evas library (ecore_evas and ecore_imf_evas) - dnl ecore_evas_opengl_x11 - want_ecore_evas_opengl_x11=yes - AC_ARG_ENABLE(ecore-evas-opengl-x11, - AC_HELP_STRING( - [--enable-ecore-evas-opengl-x11], - [enable OpenGL Xlib support in the ecore_evas module.] - ), - [ want_ecore_evas_opengl_x11=$enableval ] - ) - AC_MSG_CHECKING(whether ecore_evas OpenGL Xlib support is to be built) - AC_MSG_RESULT($want_ecore_evas_opengl_x11) +PKG_CHECK_MODULES([EVAS], [evas >= 0.9.9], + [ + have_evas="yes" + requirements_ecore_evas="evas ${requirements_ecore_evas}" + ], + [have_evas="no"]) - if test "x$want_ecore_evas_opengl_x11" = "xyes"; then - PKG_CHECK_MODULES(EVAS_OPENGL_X11, evas-opengl-x11, [ - AC_DEFINE(BUILD_ECORE_EVAS_OPENGL_X11, 1, [Support for OpenGL Xlib Engine in Ecore_Evas]) - have_ecore_evas_opengl_x11="yes"; - ], [ - have_ecore_evas_opengl_x11="no" - ]) - fi - dnl ecore_evas_xrender_x11 - want_ecore_evas_xrender_x11="yes" - AC_ARG_ENABLE(ecore-evas-xrender-x11, - AC_HELP_STRING( - [--disable-ecore-evas-xrender-x11], - [disable XRender Xlib support in the ecore_evas module. [[default=enabled]]] - ), - [ want_ecore_evas_xrender_x11=$enableval ] - ) +### Checks for header files - AC_MSG_CHECKING(whether ecore_evas XRender Xlib support is to be built) - AC_MSG_RESULT($want_ecore_evas_xrender_x11) +AC_HEADER_SYS_WAIT - if test "x$want_ecore_evas_xrender_x11" = "xyes"; then - PKG_CHECK_MODULES(EVAS_XRENDER_X11, evas-xrender-x11, [ - AC_DEFINE(BUILD_ECORE_EVAS_XRENDER_X11, 1, [Support for XRender Xlib Engine in Ecore_Evas]) - have_ecore_evas_xrender_x11="yes" - ], [ - have_ecore_evas_xrender_x11="no" - ]) - fi +case "$host_os" in + mingw* | cegcc*) + AC_DEFINE(HAVE_DLFCN_H, 1, [Define to 1 if you have the header file.]) + AC_DEFINE(HAVE_SYS_MMAN_H, 1, [Define to 1 if you have the header file.]) + AC_DEFINE(HAVE_SYS_TIME_H, 1, [Define to 1 if you have the header file.]) + ;; + *) + AC_CHECK_HEADERS([dlfcn.h features.h langinfo.h locale.h netdb.h netinet/in.h sys/time.h sys/mman.h signal.h sys/resource.h]) + ;; +esac - dnl ecore_evas_software_16_x11 - want_ecore_evas_software_16_x11=no - AC_ARG_ENABLE(ecore-evas-software-16-x11, - AC_HELP_STRING( - [--enable-ecore-evas-software-16-x11], - [enable 16bpp optimized mode support in the ecore_evas module. [[default=disabled]]] - ), - [ want_ecore_evas_software_16_x11=$enableval ] - ) +# Framebuffer (ecore_fb) +have_fb="no" +AC_CHECK_HEADER([linux/fb.h], + [AC_CHECK_HEADER([linux/input.h], [have_fb="yes"])]) - AC_MSG_CHECKING(whether ecore_evas x11-16 support is to be built) - AC_MSG_RESULT($want_ecore_evas_software_16_x11) +# Quartz header files (ecore_quartz) - if test "x$want_ecore_evas_software_16_x11" = "xyes"; then - PKG_CHECK_MODULES(EVAS_SOFTWARE_16_X11, evas-software-16-x11, - [ - AC_DEFINE(BUILD_ECORE_EVAS_SOFTWARE_16_X11, 1, [Support for X11 16bpp Engine in Ecore_Evas]) - have_ecore_evas_software_16_x11="yes"; - ] - ) - fi - else - want_ecore_evas_software_xcb="yes" - ECORE_EVAS_CHECK_MODULE([software-xcb], - [$want_ecore_evas_software_xcb], - [Software XCB], - $have_ecore_x_xcb) - - want_ecore_evas_xrender_xcb="auto" - ECORE_EVAS_CHECK_MODULE([xrender-xcb], - [$want_ecore_evas_xrender_xcb], - [XRender XCB], - $have_ecore_x_xcb) - fi +quartz_cflags=""; +quartz_libs=""; +have_quartz="no" +AC_CHECK_HEADER([Cocoa/Cocoa.h], + [ + have_quartz="yes" + quartz_cflags="-framework Cocoa"; + quartz_libs="-framework Cocoa" + ], + [have_quartz="no"]) + +AC_SUBST(quartz_cflags) +AC_SUBST(quartz_libs) + +### Checks for types +AC_CHECK_SIZEOF(int, 4) +AC_CHECK_SIZEOF(long, 4) - if test "x$have_ecore_evas_software_x11" = "xyes" -o \ - "x$have_ecore_evas_opengl_x11" = "xyes" -o \ - "x$have_ecore_evas_xrender_x11" = "xyes" -o \ - "x$have_ecore_evas_software_16_x11" = "xyes" -o \ - "x$have_ecore_evas_software_xcb" = "xyes" -o \ - "x$have_ecore_evas_xrender_xcb" = "xyes"; then - AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas]) - requirements_ecore_evas="$requirements_ecore_evas ecore-x" - fi -fi +### Checks for structures -dnl ecore_win32 -ECORE_CHECK_MODULE([Win32], [no], [yes], - [ecore_win32_libs="-lole32 -lgdi32"]) -AC_SUBST(ecore_win32_libs) +### Checks for compiler characteristics +AM_PROG_CC_STDC +AC_C_CONST +AC_C_BIGENDIAN +AC_HEADER_STDC +AC_C___ATTRIBUTE__ -want_ecore_evas_software_ddraw="yes" -ECORE_EVAS_CHECK_MODULE([software-ddraw], - [$want_ecore_evas_software_ddraw], - [Software DirectDraw], - $have_ecore_win32) +WIN32_CPPFLAGS="" +WIN32_CFLAGS="" +case "$host_os" in + mingw32ce*) + WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420" + ;; + cegcc*) + WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420" + WIN32_CFLAGS="-mwin32" + ;; + mingw*) + WIN32_CPPFLAGS="-D_WIN32_WINNT=0x0500" + ;; +esac +AC_SUBST(WIN32_CPPFLAGS) +AC_SUBST(WIN32_CFLAGS) -want_ecore_evas_direct3d="yes" -ECORE_EVAS_CHECK_MODULE([direct3d], - [$want_ecore_evas_direct3d], - [Direct3d], - $have_ecore_win32) -want_ecore_evas_opengl_glew="yes" -ECORE_EVAS_CHECK_MODULE([opengl-glew], - [$want_ecore_evas_opengl_glew], - [Glew OpenGL], - $have_ecore_win32) +### Checks for linker characteristics -want_ecore_evas_software_16_ddraw="auto" -ECORE_EVAS_CHECK_MODULE([software-16-ddraw], - [$want_ecore_evas_software_16_ddraw], - [16 bpp Software DirectDraw], - $have_ecore_win32) - -if test "x$have_ecore_evas_software_ddraw" = "xyes" -o \ - "x$have_ecore_evas_direct3d" = "xyes" -o \ - "x$have_ecore_evas_opengl_glew" = "xyes" -o \ - "x$have_ecore_evas_software_16_ddraw" = "xyes"; then - AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas]) - requirements_ecore_evas="$requirements_ecore_evas ecore-win32" -fi +# use --enable-auto-import on Windows -dnl ecore_wince +lt_enable_auto_import="" +case "$host_os" in + mingw* | cegcc*) + lt_enable_auto_import="-Wl,--enable-auto-import" + ;; +esac +AC_SUBST(lt_enable_auto_import) -ECORE_CHECK_MODULE([WinCE], [no]) -want_ecore_evas_software_16_wince="yes" -ECORE_EVAS_CHECK_MODULE([software-16-wince], - [$want_ecore_evas_software_16_wince], - [16 bpp Software Windows CE], - $have_ecore_wince) +### Checks for library functions +AC_FUNC_ALLOCA +AC_CHECK_FUNCS(gettimeofday strlcpy) -if test "x$have_ecore_evas_software_16_wince" = "xyes"; then - requirements_ecore_evas="$requirements_ecore_evas ecore-wince" -fi -dnl ecore_dfb -PKG_CHECK_MODULES(DIRECTFB, directfb >= 0.9.16, - [ have_directfb="yes" ], - [ have_directfb="no" ] -) +### Ecore modules -ECORE_CHECK_MODULE([DirectFB], [no], [$have_directfb], - [requirements_ecore_directfb="directfb"]) - -dnl ecore_evas_dfb -have_ecore_evas_dfb="no" -if test "x$have_ecore_directfb" = "xyes" -a "x$have_ecore_evas" = "xyes"; then - want_ecore_evas_dfb="yes" - AC_MSG_CHECKING(whether ecore_evas DirectFB support is to be built) - AC_ARG_ENABLE(ecore-evas-dfb, - AC_HELP_STRING([--disable-ecore-evas-dfb], [disable DirectFB in the ecore_evas module]), - [ want_ecore_evas_dfb=$enableval ] - ) - AC_MSG_RESULT($want_ecore_evas_dfb) +## Core modules + +# ecore_job +ECORE_CHECK_MODULE([Job], [${want_ecore_job}]) + +# ecore_txt +ECORE_CHECK_MODULE([Txt], [${want_ecore_txt}], [$have_iconv], + [ecore_txt_libs="$ecore_txt_libs $iconv_libs"]) + +# ecore_con +ECORE_CHECK_MODULE([Con], [${want_ecore_con}]) + +have_curl="no" +have_gnutls="no" +have_openssl="no" +if test "x${have_ecore_con}" = "xyes" ; then + requirements_ecore_con="ecore ${requirements_ecore_con}" - if test "x$want_ecore_evas_dfb" = "xyes" -a "x$have_ecore_directfb" = "xyes" ; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $DIRECTFB_CFLAGS" - PKG_CHECK_MODULES(EVAS_DIRECTFB, evas-directfb, + ECORE_CHECK_CURL([${want_curl}], [ - AC_DEFINE(BUILD_ECORE_EVAS_DIRECTFB, 1, [Support for DirectFB in Ecore_Evas]) - have_ecore_evas_dfb="yes" - requirements_ecore_evas="$requirements_ecore_evas ecore-directfb" - ] - ) - CFLAGS="$save_CFLAGS" - fi + requirements_ecore_con="libcurl ${requirements_ecore_con}" + have_curl="yes" + ], + [have_curl="no"]) + + ECORE_CHECK_GNUTLS([${want_gnutls}], + [have_gnutls="yes"], + [have_gnutls="no"]) + + ECORE_CHECK_OPENSSL([${want_openssl}], + [have_openssl="yes"], + [have_openssl="no"]) + + if test "x${have_gnutls}" = "xyes" ; then + requirements_ecore_con="gnutls ${requirements_ecore_con}" + # no need to add it to req_ecore_ipc, since they + # depends on ecore_con anyway. + else + if test "x${have_openssl}" = "xyes" ; then + requirements_ecore_con="openssl ${requirements_ecore_con}" + # no need to add it to req_ecore_ipc, since they + # depends on ecore_con anyway. + fi + fi fi -dnl ecore_fb -have_fb="no" -AC_CHECK_HEADER(linux/fb.h, - [ AC_CHECK_HEADER(linux/input.h, [ have_fb="yes" ]) ] -) -ECORE_CHECK_MODULE([FB], [no], [$have_fb]) - -tslib_libs="" -if test "x$have_ecore_fb" = "xyes" ; then -AC_CHECK_HEADER(tslib.h, - [ - AC_CHECK_LIB(ts, ts_open, tslib_libs="-lts", tslib_libs="-ltslib") - AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) - ] -) +# ecore_ipc +ECORE_CHECK_MODULE([Ipc], [${want_ecore_ipc}], [$have_ecore_con], + [requirements_ecore_ipc="ecore-con ${requirements_ecore_ipc}"]) + +# ecore_file +ECORE_CHECK_MODULE([File], [${want_ecore_file}]) + +have_poll="no" +have_inotify="no" +if test "x${have_ecore_file}" = "xyes" ; then + ECORE_CHECK_POLL([${want_poll}], [have_poll="yes"], [have_poll="no"]) + ECORE_CHECK_INOTIFY([${want_inotify}], [have_inotify="yes"], [have_inotify="no"]) + + if test "x${have_ecore_con}" = "xyes" ; then + requirements_ecore_file="${requirements_ecore_con} ${requirements_ecore_file}" + fi fi -AC_SUBST(tslib_libs) - -dnl ecore_evas_fb -have_ecore_evas_fb="no"; -if test "x$have_ecore_fb" = "xyes" -a "x$have_ecore_evas" = "xyes"; then - want_ecore_evas_fb="yes"; - AC_MSG_CHECKING(whether ecore_evas fb support is to be built) - AC_ARG_ENABLE(ecore-evas-fb, - AC_HELP_STRING([--disable-ecore-evas-fb], [disable fb in the ecore_evas module]), - [ want_ecore_evas_fb=$enableval ] - ) - AC_MSG_RESULT($want_ecore_evas_fb) - if test "x$want_ecore_evas_fb" = "xyes"; then - PKG_CHECK_MODULES(EVAS_FB, evas-fb, - [ - AC_DEFINE(BUILD_ECORE_EVAS_FB, 1, [Support for Linux FB in Ecore_Evas]) - have_ecore_evas_fb="yes" - requirements_ecore_evas="$requirements_ecore_evas ecore-fb" - ] - ) - fi +# ecore_config +ecore_config_deps="no" +if test "x$have_eet" = "xyes" -a "x$have_ecore_ipc" = "xyes" ; then + ecore_config_deps="yes" fi -dnl ecore_sdl -AC_ARG_WITH(sdl-config, AC_HELP_STRING([--with-sdl-config=PATH], [use sdl-config specified]), [ - SDL_CONFIG=$withval; - echo "using "$SDL_CONFIG" for sdl-config"; -], [ - if test -z "$SDL_CONFIG"; then - AC_PATH_PROG(SDL_CONFIG, "sdl-config", "", $PATH) - fi -]) -if test -z "$SDL_CONFIG" ; then SDL_CONFIG="sdl-config"; fi +ECORE_CHECK_MODULE([Config], [${want_ecore_config}], [$ecore_config_deps], + [requirements_ecore_config="ecore-ipc eet ecore ${requirements_ecore_config}"]) -sdl_cflags=""; -sdl_libs=""; -have_sdl="no" -AC_CHECK_HEADER(SDL/SDL.h, [ have_sdl="yes" ], [ have_sdl="no" ]) - -ECORE_CHECK_MODULE([SDL], [no], [$have_sdl]) - -dnl ecore_evas_sdl -have_ecore_evas_sdl="no"; -if test "x$have_ecore_sdl" = "xyes" -a "x$have_ecore_evas" = "xyes"; then - want_ecore_evas_sdl="yes"; - AC_MSG_CHECKING([whether ecore_evas SDL support is to be built]) - AC_ARG_ENABLE(ecore-evas-sdl, - AC_HELP_STRING([--disable-ecore-evas-sdl], [disable SDL in the ecore_evas module]), - [ want_ecore_evas_sdl=$enableval ] - ) - AC_MSG_RESULT($want_ecore_evas_sdl) - - if test "x$want_ecore_evas_sdl" = "xyes"; then - save_CFLAGS=$CFLAGS - SDL_CFLAGS=`$SDL_CONFIG --cflags` - SDL_LIBS=`$SDL_CONFIG --libs` - CFLAGS="$CFLAGS $SDL_CFLAGS" - AC_SUBST(SDL_CFLAGS) - AC_SUBST(SDL_LIBS) - - PKG_CHECK_MODULES(EVAS_SOFTWARE_SDL, evas-software-sdl, [ - AC_DEFINE(BUILD_ECORE_EVAS_SDL, 1, [Support for SDL in Ecore_Evas]) - have_ecore_evas_sdl="yes" - requirements_ecore_evas="$requirements_ecore_evas ecore-sdl" - PKG_CHECK_MODULES(SDL, sdl >= 1.3.0, [ - AC_DEFINE(BUILD_ECORE_EVAS_SDL_130, 1, [Support for SVN SDL]) - ], [ - dummy="no" - ]) - ], [ - have_ecore_evas_sdl="no" - ]) - CFLAGS=$save_CFLAGS - fi +# ecore_imf + +ECORE_CHECK_MODULE([IMF], [${want_ecore_imf}]) + +# ecore_imf_evas + +ecore_imf_evas_deps="no" +if test "x${have_ecore_imf}" = "xyes" -a "x${have_evas}" = "xyes" ; then + ecore_imf_evas_deps="yes" fi -dnl ecore_quartz +ECORE_CHECK_MODULE([IMF_EVAS], [${want_ecore_imf}], [${ecore_imf_evas_deps}], + [requirements_ecore_imf_evas="ecore-imf evas $requirements_ecore_imf_evas"]) -quartz_cflags=""; -quartz_libs=""; -have_quartz="no" -AC_CHECK_HEADER(Cocoa/Cocoa.h, - [ have_quartz="yes"; - quartz_cflags="-framework Cocoa"; - quartz_libs="-framework Cocoa" ], - [ have_quartz="no" ]) - -ECORE_CHECK_MODULE([QUARTZ], [no], [$have_quartz]) - -dnl ecore_evas_quartz -have_ecore_evas_quartz="no"; -if test "x$have_ecore_quartz" = "xyes" -a "x$have_ecore_evas" = "xyes"; then - want_ecore_evas_quartz="yes"; - AC_MSG_CHECKING([whether ecore_evas Quartz support is to be built]) - AC_ARG_ENABLE(ecore-evas-quartz, - AC_HELP_STRING([--disable-ecore-evas-quartz], [disable Quartz in the ecore_evas module]), - [ want_ecore_evas_quartz=$enableval ] - ) - AC_MSG_RESULT($want_ecore_evas_quartz) - - if test "x$want_ecore_evas_quartz" = "xyes"; then - save_CFLAGS=$CFLAGS - QUARTZ_CFLAGS=`-framework Cocoa` - QUARTZ_LIBS=`-framework Cocoa` - CFLAGS="$CFLAGS $QUARTZ_CFLAGS" - AC_SUBST(QUARTZ_CFLAGS) - AC_SUBST(QUARTZ_LIBS) - - PKG_CHECK_MODULES(EVAS_QUARTZ, evas-quartz, [ - AC_DEFINE(BUILD_ECORE_EVAS_QUARTZ, 1, [Support for Quartz in Ecore_Evas]) - have_ecore_evas_quartz="yes" - requirements_ecore_evas="$requirements_ecore_evas ecore-quartz" - ], [ - have_ecore_evas_quartz="no" - ]) - CFLAGS=$save_CFLAGS - fi +## Graphic systems + +# ecore_x{cb} + +ECORE_CHECK_MODULE([X], [${want_ecore_x}], [$have_x], + [ecore_x_libs="$ecore_x_libs $x_libs"]) + +# ecore_win32 + +ECORE_CHECK_MODULE([Win32], [${want_ecore_win32}], [yes], + [ecore_win32_libs="-lole32 -lgdi32"]) +AC_SUBST(ecore_win32_libs) + +# ecore_quartz + +ECORE_CHECK_MODULE([QUARTZ], [${want_ecore_quartz}], [$have_quartz]) + +# ecore_sdl + +ECORE_CHECK_MODULE([SDL], [${want_ecore_sdl}], [$have_sdl]) + +# ecore_fb +ECORE_CHECK_MODULE([FB], [${want_ecore_fb}], [$have_fb]) + +if test "x${have_ecore_fb}" = "xyes" ; then + ECORE_CHECK_TSLIB([${want_tslib}], [have_tslib="no"], [have_tslib="no"]) fi -dnl ecore_evas_buffer -want_ecore_evas_buffer="yes"; -have_ecore_evas_buffer="no"; -AC_MSG_CHECKING(whether ecore_evas buffer support is to be built) -AC_ARG_ENABLE(ecore-evas-buffer, - AC_HELP_STRING([--disable-ecore-evas-buffer], [disable buffer in the ecore_evas module]), - [ want_ecore_evas_buffer=$enableval ] -) -AC_MSG_RESULT($want_ecore_evas_buffer) +# ecore_directfb -if test "x$want_ecore_evas_buffer" = "xyes" -a "x$have_ecore_evas" = "xyes"; then - PKG_CHECK_MODULES(EVAS_SOFTWARE_BUFFER, evas-software-buffer, - [ - AC_DEFINE(BUILD_ECORE_EVAS_BUFFER, 1, [Support for Buffers in Ecore_Evas]) - have_ecore_evas_buffer="yes" - ], [ - have_ecore_evas_buffer="no" - ]) +ECORE_CHECK_MODULE([DirectFB], [${want_ecore_directfb}], [${have_directfb}], + [requirements_ecore_directfb="directfb ${requirements_ecore_directfb}"]) + +# ecore_wince + +ECORE_CHECK_MODULE([WinCE], [${want_ecore_wince}]) + +## Ecore Evas + +# ecore_evas + +ECORE_CHECK_MODULE([Evas], [${want_ecore_evas}], [$have_evas]) + +# ecore_evas_buffer + +ECORE_EVAS_CHECK_MODULE([software-buffer], + [${want_ecore_evas_software_buffer}], + [Software Buffer], + [yes]) + +# ecore_evas_x11 + +# ecore_evas_software_x11 + +ecore_evas_xlib_deps="no" +if test "x${have_ecore_x}" = "xyes" -a "x${have_ecore_x_xlib}" = "xyes" ; then + ecore_evas_xlib_deps="yes" fi -dnl ecore_file -ECORE_CHECK_MODULE([File], [yes]) -have_inotify="no" -have_poll="no" -if test "x$have_ecore_file" = "xyes"; then - - dnl We need to check if the right inotify version is accessible - want_inotify="yes" - AC_MSG_CHECKING(whether inotify is to be used for filemonitoring) - AC_ARG_ENABLE(inotify, - AC_HELP_STRING([--disable-inotify], [disable inotify in the ecore_file module]), - [ want_inotify=$enableval ] - ) - AC_MSG_RESULT($want_inotify) - - dnl It's hard to find a good test on how to check the correct - dnl inotify version. They changed the headers a lot. - dnl in kernel 2.6.13 __NR_inotify_init was added to the defined syscalls - dnl in asm/unistd.h and IN_MOVE_SELF was added to linux/inotify.h - dnl so with this check you need a very new kernel and kernel-headers! - if test "x$want_inotify" = "xyes"; then - AC_CHECK_LIB(c, inotify_init, [ - AC_DEFINE(HAVE_INOTIFY, 1, [ File monitoring with Inotify ]) - AC_DEFINE(HAVE_SYS_INOTIFY, 1, [ File monitoring with Inotify - sys/inotify.h ]) - have_inotify="yes" - ], - [ - AC_TRY_COMPILE( - [ - #include - #include - ], - [ int a = __NR_inotify_init; int b = IN_MOVE_SELF; ], - [ - AC_DEFINE(HAVE_INOTIFY, 1, [ File monitoring with Inotify ]) - have_inotify="yes" - ], [ - have_inotify="no" - ] - ) - ] - ) - fi +ECORE_EVAS_CHECK_MODULE([software-x11], + [${want_ecore_evas_software_x11}], + [Software Xlib], + [${ecore_evas_xlib_deps}]) - want_poll="yes" - AC_MSG_CHECKING(whether polling is to be used for filemonitoring) - AC_ARG_ENABLE(poll, - AC_HELP_STRING([--disable-poll], [disable poll in the ecore_file module]), - [ want_poll=$enableval ] - ) - AC_MSG_RESULT($want_poll) +# ecore_evas_xrender_x11 - if test "x$want_poll" = "xyes"; then - AC_DEFINE(HAVE_POLL, 1, [ File monitoring with polling ]) - have_poll="yes" - fi - requirements_ecore_file="$requirements_ecore_file $requirements_ecore_con" +ECORE_EVAS_CHECK_MODULE([xrender-x11], + [${want_ecore_evas_xrender_x11}], + [XRender Xlib], + [${ecore_evas_xlib_deps}]) + +# ecore_evas_opengl_x11 + +ECORE_EVAS_CHECK_MODULE([opengl-x11], + [${want_ecore_evas_opengl_x11}], + [OpenGL Xlib], + [${ecore_evas_xlib_deps}]) + +# ecore_evas_software_x11 16 bits + +ECORE_EVAS_CHECK_MODULE([software-16-x11], + [${want_ecore_evas_software_16_x11}], + [Software Xlib 16 bits], + [${ecore_evas_xlib_deps}]) + +# ecore_evas_software_xcb + +ecore_evas_xcb_deps="no" +if test "x${have_ecore_x}" = "xyes" -a "x${have_ecore_x_xcb}" = "xyes" ; then + ecore_evas_xcb_deps="yes" fi -dnl ecore_imf -ECORE_CHECK_MODULE([IMF], [yes]) +ECORE_EVAS_CHECK_MODULE([software-xcb], + [${want_ecore_evas_software_xcb}], + [Software XCB], + [${ecore_evas_xcb_deps}]) + +# ecore_evas_xrender_xcb + +ECORE_EVAS_CHECK_MODULE([xrender-xcb], + [${want_ecore_evas_xrender_xcb}], + [XRender XCB], + [${ecore_evas_xcb_deps}]) + +if test "x$have_ecore_evas_software_x11" = "xyes" -o \ + "x$have_ecore_evas_xrender_x11" = "xyes" -o \ + "x$have_ecore_evas_opengl_x11" = "xyes" -o \ + "x$have_ecore_evas_software_16_x11" = "xyes" -o \ + "x$have_ecore_evas_software_xcb" = "xyes" -o \ + "x$have_ecore_evas_xrender_xcb" = "xyes"; then + AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas]) + requirements_ecore_evas="ecore-x ${requirements_ecore_evas}" +fi + +# ecore_evas_win32 -try_ecore_imf_evas=no -if test "x$have_ecore_imf" = "xyes" -a "x$have_evas" = "xyes"; then - try_ecore_imf_evas=yes +ECORE_EVAS_CHECK_MODULE([software-ddraw], + [${want_ecore_evas_software_ddraw}], + [Software DirectDraw], + [${have_ecore_win32}]) + +ECORE_EVAS_CHECK_MODULE([direct3d], + [${want_ecore_evas_direct3d}], + [Direct3d], + [${have_ecore_win32}]) + +ECORE_EVAS_CHECK_MODULE([opengl-glew], + [${want_ecore_evas_opengl_glew}], + [Glew OpenGL], + [${have_ecore_win32}]) + +ECORE_EVAS_CHECK_MODULE([software-16-ddraw], + [${want_ecore_evas_software_16_ddraw}], + [16 bpp Software DirectDraw], + [${have_ecore_win32}]) + +if test "x${have_ecore_evas_software_ddraw}" = "xyes" -o \ + "x${have_ecore_evas_direct3d}" = "xyes" -o \ + "x${have_ecore_evas_opengl_glew}" = "xyes" -o \ + "x${have_ecore_evas_software_16_ddraw}" = "xyes" ; then + AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas]) + requirements_ecore_evas="ecore-win32 ${requirements_ecore_evas}" fi -ECORE_CHECK_MODULE([IMF_EVAS], [yes], [$try_ecore_imf_evas]) +# ecore_evas_quartz -EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) +ECORE_EVAS_CHECK_MODULE([quartz], + [${want_ecore_evas_quartz}], + [Quartz], + [${have_ecore_quartz}], + [requirements_ecore_evas="ecore-quartz ${requirements_ecore_evas}"]) + +# ecore_evas_software_sdl + +ECORE_EVAS_CHECK_MODULE([software-sdl], + [${want_ecore_evas_software_sdl}], + [Software SDL], + [${have_ecore_sdl}], + [requirements_ecore_evas="ecore-sdl ${requirements_ecore_evas}"]) + +# ecore_evas_directfb + +ECORE_EVAS_CHECK_MODULE([directfb], + [${want_ecore_evas_directfb}], + [DirectFB], + [${have_ecore_directfb}], + [requirements_ecore_evas="ecore-directfb ${requirements_ecore_evas}"]) + +# ecore_evas_fb + +ECORE_EVAS_CHECK_MODULE([fb], + [${want_ecore_evas_fb}], + [Linux Framebuffer], + [${have_ecore_fb}], + [requirements_ecore_evas="ecore-fb ${requirements_ecore_evas}"]) + +# ecore_evas_wince + +ECORE_EVAS_CHECK_MODULE([software-16-wince], + [${want_ecore_evas_software_16_wince}], + [16 bpp Software Windows CE], + [${have_ecore_wince}], + [requirements_ecore_evas="ecore-wince ${requirements_ecore_evas}"]) -dnl requirements + + +### requirements + +AC_SUBST(requirements_ecore) AC_SUBST(requirements_ecore_con) AC_SUBST(requirements_ecore_config) AC_SUBST(requirements_ecore_directfb) AC_SUBST(requirements_ecore_evas) AC_SUBST(requirements_ecore_fb) AC_SUBST(requirements_ecore_file) +AC_SUBST(requirements_ecore_imf) +AC_SUBST(requirements_ecore_imf_evas) AC_SUBST(requirements_ecore_ipc) AC_SUBST(requirements_ecore_job) +AC_SUBST(requirements_ecore_quartz) +AC_SUBST(requirements_ecore_sdl) AC_SUBST(requirements_ecore_txt) AC_SUBST(requirements_ecore_x) -AC_SUBST(requirements_ecore_sdl) -AC_SUBST(requirements_ecore_quartz) - -# set up conditionals -AM_CONDITIONAL(BUILD_ECORE_X, test $have_ecore_x = yes) -AM_CONDITIONAL(BUILD_ECORE_X_XLIB, test $have_ecore_x_xlib = yes) -AM_CONDITIONAL(BUILD_ECORE_X_XCB, test $have_ecore_x_xcb = yes) +AC_SUBST(requirements_ecore_win32) +AC_SUBST(requirements_ecore_wince) AC_OUTPUT([ Makefile @@ -1005,14 +1002,9 @@ echo "Optional Modules:" echo echo " Core:" echo +echo " Ecore........................: always" echo " Ecore_Job....................: $have_ecore_job" echo " Ecore_Txt....................: $have_ecore_txt" -echo " Ecore_File...................: $have_ecore_file" -if test "x$have_ecore_file" = "xyes" ; then - echo " Inotify....................: $have_inotify" - echo " Poll.......................: $have_poll" - echo " CURL.......................: $have_curl" -fi echo " Ecore_Con....................: $have_ecore_con" if test "x$have_ecore_con" = "xyes" ; then echo -n " OpenSSL....................: $have_openssl" @@ -1026,7 +1018,7 @@ fi echo " Abstract Sockets...........: $want_abstract_sockets" fi echo " Ecore_Ipc....................: $have_ecore_ipc" -if test "x$have_ecore_con" = "xyes" ; then +if test "x$have_ecore_ipc" = "xyes" ; then echo -n " OpenSSL....................: $have_openssl" if test "x$have_gnutls" = "xyes" ; then echo " (disabled)" @@ -1035,6 +1027,12 @@ else fi echo " GnuTLS.....................: $have_gnutls" fi +echo " Ecore_File...................: $have_ecore_file" +if test "x$have_ecore_file" = "xyes" ; then + echo " Inotify....................: $have_inotify" + echo " Poll.......................: $have_poll" + echo " CURL.......................: $have_curl" +fi echo " Ecore_Config.................: $have_ecore_config" echo " Ecore_IMF....................: $have_ecore_imf" echo " Ecore_IMF_Evas...............: $have_ecore_imf_evas" @@ -1061,7 +1059,7 @@ if test "x$have_ecore_x" = "xyes" ; then else echo " Ecore_X (Xlib backend).......: $have_ecore_x" echo " Xcursor....................: $use_Xcursor" - echo " Xkb........................: $use_Xkb" + echo " Xkb........................: $use_xkb" echo " Xprint.....................: $use_xprint" echo " Xinerama...................: $use_xinerama" echo " Xrandr.....................: $use_xrandr" @@ -1077,10 +1075,13 @@ else echo " Ecore_X......................: $have_ecore_x" fi echo " Ecore_Win32..................: $have_ecore_win32" -echo " Ecore_SDL....................: $have_ecore_sdl" echo " Ecore_Quartz.................: $have_ecore_quartz" +echo " Ecore_SDL....................: $have_ecore_sdl" echo " Ecore_FB.....................: $have_ecore_fb" -echo " Ecore_DFB....................: $have_ecore_directfb" +if test "x${have_ecore_fb}" = "xyes" ; then + echo " Touchscreen................: $have_tslib" +fi +echo " Ecore_DirectFB...............: $have_ecore_directfb" echo " Ecore_WinCE..................: $have_ecore_wince" echo @@ -1088,8 +1089,8 @@ echo " Ecore Evas:" echo echo " Ecore_Evas...................: $have_ecore_evas" -if test "x$have_ecore_evas" = "xyes" ; then - echo " Software Memory Buffer.....: $have_ecore_evas_buffer" +if test "x${have_ecore_evas}" = "xyes" ; then + echo " Software Memory Buffer.....: $have_ecore_evas_software_buffer" echo " Software X11...............: $have_ecore_evas_software_x11" echo " XRender X11................: $have_ecore_evas_xrender_x11" echo " OpenGL X11.................: $have_ecore_evas_opengl_x11" @@ -1098,9 +1099,9 @@ if test "x$have_ecore_evas" = "xyes" ; then echo " Software DirectDraw........: $have_ecore_evas_software_ddraw" echo " Direct3D...................: $have_ecore_evas_direct3d" echo " OpenGL Glew................: $have_ecore_evas_opengl_glew" - echo " Software SDL...............: $have_ecore_evas_sdl" echo " Quartz.....................: $have_ecore_evas_quartz" - echo " DirectFB...................: $have_ecore_evas_dfb" + echo " Software SDL...............: $have_ecore_evas_software_sdl" + echo " DirectFB...................: $have_ecore_evas_directfb" echo " Software Framebuffer.......: $have_ecore_evas_fb" echo " Software 16bit X11.........: $have_ecore_evas_software_16_x11" echo " Software 16bit DirectDraw..: $have_ecore_evas_software_16_ddraw" @@ -1109,5 +1110,12 @@ fi echo echo " Documentation.................: ${build_doc}" echo -echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE." +echo " Compilation...................: make (gmake on some systems)" +if test "x${build_doc}" = "xyes" ; then + echo " Build of the documentation....: make doc" +fi +echo +echo " Installation..................: make install" +echo +echo " prefix.....................: $prefix" echo diff --git a/ecore-con.pc.in b/ecore-con.pc.in index c0ad576..04dbb4e 100644 --- a/ecore-con.pc.in +++ b/ecore-con.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore-con Description: E core library, Con module -Requires: ecore @requirements_ecore_con@ +Requires: @requirements_ecore_con@ Version: @VERSION@ Libs: -L${libdir} -lecore_con Cflags: -I${includedir} diff --git a/ecore-config.pc.in b/ecore-config.pc.in index 2d11077..1dbedf3 100644 --- a/ecore-config.pc.in +++ b/ecore-config.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore-config Description: E core library, Config module -Requires: ecore @requirements_ecore_config@ +Requires: @requirements_ecore_config@ Version: @VERSION@ Libs: -L${libdir} -lecore_config Cflags: -I${includedir} diff --git a/ecore-directfb.pc.in b/ecore-directfb.pc.in index 4262972..d835869 100644 --- a/ecore-directfb.pc.in +++ b/ecore-directfb.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore-directfb Description: E core library, DirectFB module -Requires: ecore @requirements_ecore_directfb@ +Requires: @requirements_ecore_directfb@ Version: @VERSION@ Libs: -L${libdir} -lecore_directfb Cflags: -I${includedir} diff --git a/ecore-evas.pc.in b/ecore-evas.pc.in index 164b863..d08d865 100644 --- a/ecore-evas.pc.in +++ b/ecore-evas.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore-evas Description: E core library, Evas module -Requires: ecore @requirements_ecore_evas@ +Requires: @requirements_ecore_evas@ Version: @VERSION@ Libs: -L${libdir} -lecore_evas @ecore_evas_libs@ Cflags: -I${includedir} diff --git a/ecore-fb.pc.in b/ecore-fb.pc.in index 6402ce4..88f0d04 100644 --- a/ecore-fb.pc.in +++ b/ecore-fb.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore-fb Description: E core library, FB module -Requires: ecore @requirements_ecore_fb@ +Requires: @requirements_ecore_fb@ Version: @VERSION@ Libs: -L${libdir} -lecore_fb Cflags: -I${includedir} diff --git a/ecore-file.pc.in b/ecore-file.pc.in index 2dde219..3ecf19a 100644 --- a/ecore-file.pc.in +++ b/ecore-file.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore-file Description: E core library, File module -Requires: ecore @requirements_ecore_file@ +Requires: @requirements_ecore_file@ Version: @VERSION@ Libs: -L${libdir} -lecore_file Cflags: -I${includedir} diff --git a/ecore-imf-evas.pc.in b/ecore-imf-evas.pc.in index 0ce11d5..faa4ad6 100644 --- a/ecore-imf-evas.pc.in +++ b/ecore-imf-evas.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore-imf-evas Description: E core library, IMF Evas module -Requires: ecore-imf evas +Requires: @requirements_ecore_imf_evas@ Version: @VERSION@ Libs: -L${libdir} -lecore_imf_evas Cflags: -I${includedir} diff --git a/ecore-imf.pc.in b/ecore-imf.pc.in index 7a98b8c..f8184da 100644 --- a/ecore-imf.pc.in +++ b/ecore-imf.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore-imf Description: E core library, IMF module -Requires: ecore +Requires: @requirements_ecore_imf@ Version: @VERSION@ Libs: -L${libdir} -lecore_imf Cflags: -I${includedir} diff --git a/ecore-ipc.pc.in b/ecore-ipc.pc.in index 2dc4beb..a4f666b 100644 --- a/ecore-ipc.pc.in +++ b/ecore-ipc.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore-ipc Description: E core library, IPC module -Requires: ecore-con @requirements_ecore_ipc@ +Requires: @requirements_ecore_ipc@ Version: @VERSION@ Libs: -L${libdir} -lecore_ipc Cflags: -I${includedir} diff --git a/ecore-job.pc.in b/ecore-job.pc.in index fc914a0..251c806 100644 --- a/ecore-job.pc.in +++ b/ecore-job.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore-job Description: E core library, Job module -Requires: ecore @requirements_ecore_job@ +Requires: @requirements_ecore_job@ Version: @VERSION@ Libs: -L${libdir} -lecore_job Cflags: -I${includedir} diff --git a/ecore-quartz.pc.in b/ecore-quartz.pc.in index 5901dc9..628ad79 100644 --- a/ecore-quartz.pc.in +++ b/ecore-quartz.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore-quartz Description: E core library, Quartz module -Requires: ecore @requirements_ecore_quartz@ +Requires: @requirements_ecore_quartz@ Version: @VERSION@ Libs: -L${libdir} -lecore_quartz Cflags: -I${includedir} diff --git a/ecore-sdl.pc.in b/ecore-sdl.pc.in index bba6f88..eb0cc69 100644 --- a/ecore-sdl.pc.in +++ b/ecore-sdl.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore-sdl Description: E core library, SDL module -Requires: ecore @requirements_ecore_sdl@ +Requires: @requirements_ecore_sdl@ Version: @VERSION@ Libs: -L${libdir} -lecore_sdl Cflags: -I${includedir} diff --git a/ecore-win32.pc.in b/ecore-win32.pc.in index 9d403ff..9321385 100644 --- a/ecore-win32.pc.in +++ b/ecore-win32.pc.in @@ -5,6 +5,7 @@ includedir=@includedir@ Name: ecore-win32 Description: E core library, Win32 module +Requires: @requirements_ecore_win32@ Version: @VERSION@ Libs: -L${libdir} -lecore_win32 Libs.private: @ddraw_libs@ @direct3d_libs@ diff --git a/ecore-wince.pc.in b/ecore-wince.pc.in index a8275f8..9d06ae5 100644 --- a/ecore-wince.pc.in +++ b/ecore-wince.pc.in @@ -5,6 +5,7 @@ includedir=@includedir@ Name: ecore-wince Description: E core library, WinCE module +Requires: @requirements_ecore_wince@ Version: @VERSION@ Libs: -L${libdir} -lecore_wince Libs.private: @WIN32_LIBS@ diff --git a/ecore.pc.in b/ecore.pc.in index 0de87ff..ebb59de 100644 --- a/ecore.pc.in +++ b/ecore.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ecore Description: Ecore event abstraction library -Requires: eina-0 +Requires: @requirements_ecore@ Version: @VERSION@ Libs: -L${libdir} -lecore Libs.private: -lm diff --git a/m4/ecore_check_module.m4 b/m4/ecore_check_module.m4 index 8859c52..8972219 100644 --- a/m4/ecore_check_module.m4 +++ b/m4/ecore_check_module.m4 @@ -1,99 +1,105 @@ dnl use: ECORE_CHECK_MODULE(Foo, default-enabled[, dependancy[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]]) AC_DEFUN([ECORE_CHECK_MODULE], [ -pushdef([UP], translit([$1], [a-z], [A-Z]))dnl -pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl +m4_pushdef([UP], m4_toupper([[$1]]))dnl +m4_pushdef([DOWN], m4_tolower([[$1]]))dnl -have_ecore_[]DOWN="no" -ecore_[]DOWN[]_cflags="" -ecore_[]DOWN[]_libs="" +have_ecore_[]m4_defn([DOWN])=no +ecore_[]m4_defn([DOWN])[]_cflags= +ecore_[]m4_defn([DOWN])[]_libs= +want_module=$2 -ifelse("x$2", "xno", -[ - AC_ARG_ENABLE(ecore-[]DOWN, - AC_HELP_STRING( - [--enable-ecore-[]DOWN], - [enable the ecore_[]DOWN module. [[default=disabled]]] - ), - [ want_ecore_[]DOWN=$enableval ], - [ want_ecore_[]DOWN=no ]) -], -[ - AC_ARG_ENABLE(ecore-[]DOWN, - AC_HELP_STRING( - [--disable-ecore-[]DOWN], - [disable the ecore_[]DOWN module. [[default=enabled]]] - ), - [ want_ecore_[]DOWN=$enableval ], - [ want_ecore_[]DOWN=yes ]) -]) +if test "x${want_module}" = "xno" ; then + AC_ARG_ENABLE(ecore-[]m4_defn([DOWN]), + [AC_HELP_STRING( + [--enable-ecore-[]m4_defn([DOWN])], + [enable the ecore_]m4_defn([DOWN])[ module. [[default=disabled]]])], + [want_module=$enableval], + [want_module=no]) +else + AC_ARG_ENABLE(ecore-[]m4_defn([DOWN]), + [AC_HELP_STRING( + [--disable-ecore-[]m4_defn([DOWN])], + [disable the ecore_]m4_defn([DOWN])[ module. [[default=enabled]]])], + [want_module=$enableval], + [want_module=yes]) +fi -AC_MSG_CHECKING(whether ecore_[]DOWN module is to be built) - -if test "x$want_ecore_[]DOWN" = "xyes" ; then - if test "x$3" = "x" -o "x$3" = "xyes" ; then - AC_DEFINE(BUILD_ECORE_[]UP, 1, [Build Ecore_$1 Module]) - have_ecore_[]DOWN="yes" - ecore_[]DOWN[]_libs="-lecore_[]DOWN" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no (dependancy failed)]) - fi +AC_MSG_CHECKING([whether ecore_]m4_defn([DOWN])[ module is to be built]) + +if test "x${want_module}" = "xyes" ; then + if test "x$3" = "x" -o "x$3" = "xyes" ; then + AC_DEFINE([BUILD_ECORE_]m4_defn([UP]), [1], [Build Ecore_$1 Module]) + have_ecore_[]m4_defn([DOWN])="yes" + ecore_[]m4_defn([DOWN])[]_libs="-lecore_[]m4_defn([DOWN])" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no (dependency failed)]) + fi else - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) fi -AM_CONDITIONAL(BUILD_ECORE_[]UP, test "x$have_ecore_[]DOWN" = "xyes") +AM_CONDITIONAL([BUILD_ECORE_]UP, [test "x$have_ecore_]DOWN[" = "xyes"]) -if test "x$have_ecore_[]DOWN" = "xyes" ; then - ifelse([$4], , :, [$4]) +if test "x$have_ecore_[]m4_defn([DOWN])" = "xyes" ; then + m4_default([$4], [:]) else - ifelse([$5], , :, [$5]) + m4_default([$5], [:]) fi -AC_SUBST(ecore_[]DOWN[]_cflags) -AC_SUBST(ecore_[]DOWN[]_libs) +AC_SUBST(ecore_[]m4_defn([DOWN])[]_cflags) +AC_SUBST(ecore_[]m4_defn([DOWN])[]_libs) -popdef([UP]) -popdef([DOWN]) +m4_popdef([UP]) +m4_popdef([DOWN]) ]) dnl use: ECORE_EVAS_CHECK_MODULE(foo-bar, want, description, backend[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) AC_DEFUN([ECORE_EVAS_CHECK_MODULE], [ -pushdef([UP], translit([$1], [-a-z], [_A-Z]))dnl -pushdef([DOWN], translit([$1], [-A-Z], [_a-z]))dnl +m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl -have_ecore_evas_[]DOWN="no" +have_ecore_evas_[]m4_defn([DOWN])="no" want_module="$2" -AC_ARG_ENABLE(ecore-$1, - AC_HELP_STRING( - [--enable-ecore-evas-$1], - [enable $3 support in the ecore_evas module.] - ), - [ want_module=$enableval ] -) -AC_MSG_CHECKING(whether ecore_evas $3 support is to be built) -AC_MSG_RESULT($want_module) +if test "x${want_module}" = "xno" ; then + AC_ARG_ENABLE(ecore-evas-$1, + [AC_HELP_STRING( + [--enable-ecore-evas-$1], + [enable $3 support in the ecore_evas module.])], + [want_module=$enableval]) +else + AC_ARG_ENABLE(ecore-evas-$1, + [AC_HELP_STRING( + [--disable-ecore-evas-$1], + [disable $3 support in the ecore_evas module.])], + [want_module=$enableval]) +fi + +AC_MSG_CHECKING([whether ecore_evas $3 support is to be built]) +AC_MSG_RESULT([${want_module}]) if test "x$4" = "xyes" -a \ "x$have_ecore_evas" = "xyes" -a \ "x$want_module" = "xyes" ; then - PKG_CHECK_MODULES(EVAS_[]UP, evas-$1, - [ - AC_DEFINE(BUILD_ECORE_EVAS_[]UP, 1, [Support for $3 Engine in Ecore_Evas]) - have_ecore_evas_[]DOWN="yes"; - ] - ) + PKG_CHECK_EXISTS([evas-$1], + [ + AC_DEFINE([BUILD_ECORE_EVAS_]m4_defn([UP]), [1], [Support for $3 Engine in Ecore_Evas]) + have_ecore_evas_[]m4_defn([DOWN])="yes" + ]) fi -if test "x$have_ecore_evas_[]DOWN" = "xyes" ; then - ifelse([$5], , :, [$5]) +AC_MSG_CHECKING([whether ecore_evas $3 support is built]) +AC_MSG_RESULT([$have_ecore_evas_]m4_defn([DOWN])) + +if test "x$have_ecore_evas_[]m4_defn([DOWN])" = "xyes" ; then + m4_default([$5], [:]) else - ifelse([$6], , :, [$6]) + m4_default([$6], [:]) fi -popdef([UP]) -popdef([DOWN]) +m4_popdef([UP]) +m4_popdef([DOWN]) ]) diff --git a/m4/ecore_check_options.m4 b/m4/ecore_check_options.m4 new file mode 100644 index 0000000..9c805e6 --- /dev/null +++ b/m4/ecore_check_options.m4 @@ -0,0 +1,212 @@ +dnl use: ECORE_CHECK_POLL(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +AC_DEFUN([ECORE_CHECK_POLL], +[ +_ecore_want_poll=$1 +_ecore_have_poll="no" + +AC_ARG_ENABLE(poll, + [AC_HELP_STRING([--disable-poll], [disable poll in the ecore_file module])], + [ + if test "x${enableval}" = "xyes" ; then + _ecore_want_poll="yes" + else + _ecore_want_poll="no" + fi + ]) + +AC_MSG_CHECKING(whether polling is to be used for filemonitoring) +AC_MSG_RESULT(${_ecore_want_poll}) + +if test "x${_ecore_want_poll}" = "xyes" ; then + AC_DEFINE([HAVE_POLL], [1], [ File monitoring with polling ]) + _ecore_have_poll="yes" +fi + +if test "x${_ecore_have_poll}" = "xyes" ; then + m4_default([$2], [:]) +else + m4_default([$3], [:]) +fi +]) + +dnl use: ECORE_CHECK_INOTIFY(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +AC_DEFUN([ECORE_CHECK_INOTIFY], +[ +_ecore_want_inotify=$1 +_ecore_have_inotify="no" + +dnl We need to check if the right inotify version is accessible +_ecore_want_inotify="yes" +AC_ARG_ENABLE(inotify, + [AC_HELP_STRING([--disable-inotify], [disable inotify in the ecore_file module])], + [ + if test "x${enableval}" = "xyes" ; then + _ecore_want_inotify="yes" + else + _ecore_want_inotify="no" + fi + ]) + +AC_MSG_CHECKING(whether inotify is to be used for filemonitoring) +AC_MSG_RESULT($_ecore_want_inotify) + +dnl It is hard to find a good test on how to check the correct +dnl inotify version. They changed the headers a lot. +dnl in kernel 2.6.13 __NR_inotify_init was added to the defined syscalls +dnl in asm/unistd.h and IN_MOVE_SELF was added to linux/inotify.h +dnl so with this check you need a very new kernel and kernel-headers! + +if test "x${_ecore_want_inotify}" = "xyes" ; then + AC_CHECK_LIB([c], [inotify_init], + [ + AC_DEFINE(HAVE_INOTIFY, 1, [ File monitoring with Inotify ]) + AC_DEFINE(HAVE_SYS_INOTIFY, 1, [ File monitoring with Inotify - sys/inotify.h ]) + _ecore_have_inotify="yes" + ], + [ + AC_TRY_COMPILE( + [ + #include + #include + ], + [int a = __NR_inotify_init; int b = IN_MOVE_SELF;], + [ + AC_DEFINE([HAVE_INOTIFY], [1], [ File monitoring with Inotify ]) + _ecore_have_inotify="yes" + ], + [_ecore_have_inotify="no"]) + ]) +fi + +if test "x$_ecore_have_inotify" = "xyes" ; then + m4_default([$2], [:]) +else + m4_default([$3], [:]) +fi +]) + +dnl use: ECORE_CHECK_CURL(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +AC_DEFUN([ECORE_CHECK_CURL], +[ +_ecore_want_curl=$1 +_ecore_have_curl="no" + +AC_ARG_ENABLE([curl], + [AC_HELP_STRING([--disable-curl], [disable curl support])], + [ + if test "x${enableval}" = "xyes" ; then + _ecore_want_curl="yes" + else + _ecore_want_curl="no" + fi + ]) + +if test "x${_ecore_want_curl}" = "xyes" ; then + PKG_CHECK_MODULES(CURL, libcurl, + [ + AC_DEFINE(HAVE_CURL, 1, [ Downloading with CURL ]) + _ecore_have_curl="yes" + ], + [_ecore_have_curl="no"]) +fi + +if test "x$_ecore_have_curl" = "xyes" ; then + m4_default([$2], [:]) +else + m4_default([$3], [:]) +fi +]) + +dnl use: ECORE_CHECK_GNUTLS(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +AC_DEFUN([ECORE_CHECK_GNUTLS], +[ +_ecore_want_gnutls=$1 +_ecore_have_gnutls="no" + +AC_ARG_ENABLE([gnutls], + [AC_HELP_STRING([--disable-gnutls], [disable gnutls support])], + [ + if test "x${enableval}" = "xyes" ; then + _ecore_want_gnutls="yes" + else + _ecore_want_gnutls="no" + fi + ]) + +if test "x${_ecore_want_gnutls}" = "xyes" -o "x${_ecore_want_gnutls}" = "xauto" ; then + PKG_CHECK_MODULES([TLS], [gnutls], + [ + AC_DEFINE([USE_GNUTLS], [1], [Use GnuTLS]) + _ecore_have_gnutls="yes" + ], + [_ecore_have_gnutls="no"]) + # for ecore_con_ssl.c + PKG_CHECK_MODULES([TLS2], [gnutls >= 2.0.0], + [AC_DEFINE(USE_GNUTLS2, 1, [Use GnuTLS 2 or higher])], + [dummy="no"]) +fi + +if test "x$_ecore_have_gnutls" = "xyes" ; then + ifelse([$2], , :, [$2]) +else + ifelse([$3], , :, [$3]) +fi +]) + +dnl use: ECORE_CHECK_OPENSSL(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +AC_DEFUN([ECORE_CHECK_OPENSSL], +[ +_ecore_want_openssl=$1 +_ecore_have_openssl="no" + +AC_ARG_ENABLE(openssl, + [AC_HELP_STRING([--disable-openssl], [disable openssl support])], + [ + if test "x${enableval}" = "xyes" ; then + _ecore_want_openssl="yes" + else + _ecore_want_openssl="no" + fi + ]) + +if test "x${_ecore_want_openssl}" = "xyes" -o "x${_ecore_want_openssl}" = "xauto"; then + PKG_CHECK_MODULES([SSL], + [openssl], + [ + AC_DEFINE(USE_OPENSSL, 1, [Use OpenSSL]) + _ecore_have_openssl="yes" + ], + [_ecore_have_openssl="no"]) +fi + +if test "x$_ecore_have_openssl" = "xyes" ; then + m4_default([$2], [:]) +else + m4_default([$3], [:]) +fi +]) + +dnl use: ECORE_CHECK_TSLIB(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +AC_DEFUN([ECORE_CHECK_TSLIB], +[ +_ecore_want_tslib=$1 +_ecore_have_tslib="no" +tslib_libs="" + +if test "x${_ecore_want_tslib}" = "xyes" -o "x${_ecore_want_tslib}" = "xauto" ; then + AC_CHECK_HEADER([tslib.h], + [ + AC_CHECK_LIB([ts], [ts_open], [tslib_libs="-lts", tslib_libs="-ltslib"]) + AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) + _ecore_have_ts="yes" + ]) +fi + +AC_SUBST(tslib_libs) + +if test "x$_ecore_have_tslib" = "xyes" ; then + m4_default([$2], [:]) +else + m4_default([$3], [:]) +fi +]) diff --git a/src/lib/ecore/Makefile.am b/src/lib/ecore/Makefile.am index c15863f..8f4ec19 100644 --- a/src/lib/ecore/Makefile.am +++ b/src/lib/ecore/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = @EVIL_CFLAGS@ @WIN32_CPPFLAGS@ +AM_CPPFLAGS = @EVIL_CFLAGS@ @WIN32_CPPFLAGS@ @EFL_ECORE_BUILD@ AM_CFLAGS = @WIN32_CFLAGS@ @EINA_CFLAGS@ @WIN32_CPPFLAGS@ lib_LTLIBRARIES = libecore.la diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h index 6e97a15..5582bd1 100644 --- a/src/lib/ecore_evas/Ecore_Evas.h +++ b/src/lib/ecore_evas/Ecore_Evas.h @@ -64,6 +64,7 @@ extern "C" { #define HAVE_ECORE_EVAS_X11_16 1 #define HAVE_ECORE_EVAS_DIRECTFB 1 #define HAVE_ECORE_EVAS_WIN32 1 +#define HAVE_ECORE_EVAS_QUARTZ 1 #define HAVE_ECORE_EVAS_SDL 1 #define HAVE_ECORE_EVAS_WINCE 1 @@ -78,7 +79,8 @@ typedef enum _Ecore_Evas_Engine_Type ECORE_EVAS_ENGINE_SOFTWARE_DDRAW, ECORE_EVAS_ENGINE_DIRECT3D, ECORE_EVAS_ENGINE_OPENGL_GLEW, - ECORE_EVAS_ENGINE_SDL, + ECORE_EVAS_ENGINE_QUARTZ, + ECORE_EVAS_ENGINE_SOFTWARE_SDL, ECORE_EVAS_ENGINE_DIRECTFB, ECORE_EVAS_ENGINE_SOFTWARE_FB, ECORE_EVAS_ENGINE_SOFTWARE_16_X11, @@ -181,7 +183,7 @@ EAPI Ecore_Evas *ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent, int width, int height); -EAPI Ecore_Evas *ecore_evas_software_ddraw_16_new(Ecore_Win32_Window *parent, +EAPI Ecore_Evas *ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent, int x, int y, int width, @@ -236,6 +238,8 @@ EAPI Ecore_Evas *ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *paren EAPI Ecore_WinCE_Window *ecore_evas_software_wince_window_get(const Ecore_Evas *ee); +EAPI Ecore_Evas *ecore_evas_quartz_new(const char* name, int w, int h); + /* generic manipulation calls */ EAPI const char *ecore_evas_engine_name_get(const Ecore_Evas *ee); EAPI Ecore_Evas *ecore_evas_ecore_evas_get(const Evas *e); diff --git a/src/lib/ecore_evas/Makefile.am b/src/lib/ecore_evas/Makefile.am index 6b87597..9581230 100644 --- a/src/lib/ecore_evas/Makefile.am +++ b/src/lib/ecore_evas/Makefile.am @@ -41,7 +41,7 @@ ECORE_SDL_LIB = endif if BUILD_ECORE_QUARTZ -ECORE_QUARTZ_INC = -I$(top_srcdir)/src/lib/ecore_quartz @QUARTZ_CFLAGS@ -xobjective-c -framework Cocoa +ECORE_QUARTZ_INC = -I$(top_srcdir)/src/lib/ecore_quartz @quartz_cflags@ -xobjective-c ECORE_QUARTZ_LIB = $(top_builddir)/src/lib/ecore_quartz/libecore_quartz.la else ECORE_QUARTZ_INC = @@ -61,6 +61,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_evas \ -I$(top_builddir)/src/lib/ecore \ -I$(top_builddir)/src/lib/ecore_evas \ +@EFL_ECORE_EVAS_BUILD@ \ $(ECORE_X_INC) \ $(ECORE_FB_INC) \ $(ECORE_DIRECTFB_INC) \ @@ -104,7 +105,7 @@ $(top_builddir)/src/lib/ecore/libecore.la \ @EVAS_LIBS@ \ @XCB_LIBS@ \ @SDL_LIBS@ \ -@QUARTZ_LIBS@ \ +@quartz_libs@ \ @EVIL_LIBS@ \ @EINA_LIBS@ diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index 33a994c..f6d08b2 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -31,7 +31,7 @@ ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine) switch (engine) { case ECORE_EVAS_ENGINE_SOFTWARE_BUFFER: -#ifdef BUILD_ECORE_EVAS_BUFFER +#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER return 1; #else return 0; @@ -84,8 +84,8 @@ ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine) #else return 0; #endif - case ECORE_EVAS_ENGINE_SDL: -#ifdef BUILD_ECORE_EVAS_SDL + case ECORE_EVAS_ENGINE_SOFTWARE_SDL: +#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL return 1; #else return 0; @@ -175,7 +175,7 @@ ecore_evas_shutdown(void) #ifdef BUILD_ECORE_EVAS_FB while (_ecore_evas_fb_shutdown()); #endif -#ifdef BUILD_ECORE_EVAS_BUFFER +#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER while (_ecore_evas_buffer_shutdown()); #endif #ifdef BUILD_ECORE_EVAS_DIRECTFB @@ -339,7 +339,7 @@ _ecore_evas_constructor_software_16_x11(int x, int y, int w, int h, const char * } #endif -#ifdef BUILD_ECORE_EVAS_SDL +#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL static Ecore_Evas * _ecore_evas_constructor_sdl(int x, int y, int w, int h, const char *extra_options) { @@ -441,7 +441,7 @@ _ecore_evas_constructor_opengl_glew(int x, int y, int w, int h, const char *extr static Ecore_Evas * _ecore_evas_constructor_software_16_ddraw(int x, int y, int w, int h, const char *extra_options) { - return ecore_evas_software_ddraw_new(NULL, x, y, w, h); + return ecore_evas_software_16_ddraw_new(NULL, x, y, w, h); } #endif @@ -471,7 +471,7 @@ _ecore_evas_constructor_software_16_wince_gdi(int x, int y, int w, int h, const } #endif -#ifdef BUILD_ECORE_EVAS_BUFFER +#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER static Ecore_Evas * _ecore_evas_constructor_buffer(int x, int y, int w, int h, const char *extra_options) { @@ -528,13 +528,13 @@ static const struct ecore_evas_engine _engines[] = { #endif /* Last chance to have a window */ -#ifdef BUILD_ECORE_EVAS_SDL +#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL {"sdl", _ecore_evas_constructor_sdl}, {"software_16_sdl", _ecore_evas_constructor_sdl16}, #endif /* independent */ -#ifdef BUILD_ECORE_EVAS_BUFFER +#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER {"buffer", _ecore_evas_constructor_buffer}, #endif {NULL, NULL} diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c b/src/lib/ecore_evas/ecore_evas_buffer.c index 866b700..fb50635 100644 --- a/src/lib/ecore_evas/ecore_evas_buffer.c +++ b/src/lib/ecore_evas/ecore_evas_buffer.c @@ -8,7 +8,7 @@ #include "ecore_evas_private.h" #include "Ecore_Evas.h" -#ifdef BUILD_ECORE_EVAS_BUFFER +#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER static int _ecore_evas_init_count = 0; static int _ecore_evas_fps_debug = 0; @@ -435,7 +435,7 @@ static const Ecore_Evas_Engine_Func _ecore_buffer_engine_func = EAPI Ecore_Evas * ecore_evas_buffer_new(int w, int h) { -#ifdef BUILD_ECORE_EVAS_BUFFER +#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER Evas_Engine_Info_Buffer *einfo; Ecore_Evas *ee; int rmethod; @@ -514,7 +514,7 @@ ecore_evas_buffer_new(int w, int h) EAPI const void * ecore_evas_buffer_pixels_get(Ecore_Evas *ee) { -#ifdef BUILD_ECORE_EVAS_BUFFER +#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER _ecore_evas_buffer_render(ee); return ee->engine.buffer.pixels; #else @@ -525,7 +525,7 @@ ecore_evas_buffer_pixels_get(Ecore_Evas *ee) EAPI Evas_Object * ecore_evas_object_image_new(Ecore_Evas *ee_target) { -#ifdef BUILD_ECORE_EVAS_BUFFER +#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER Evas_Object *o; Evas_Engine_Info_Buffer *einfo; Ecore_Evas *ee; diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h index 4d32413..501ca62 100644 --- a/src/lib/ecore_evas/ecore_evas_private.h +++ b/src/lib/ecore_evas/ecore_evas_private.h @@ -66,7 +66,7 @@ # include "Ecore_DirectFB.h" #endif -#ifdef BUILD_ECORE_EVAS_BUFFER +#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER # include #endif @@ -189,7 +189,7 @@ struct _Ecore_Evas_Engine int real_h; } fb; #endif -#ifdef BUILD_ECORE_EVAS_BUFFER +#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER struct { void *pixels; Evas_Object *image; @@ -306,7 +306,7 @@ int _ecore_evas_x_shutdown(void); #ifdef BUILD_ECORE_EVAS_FB int _ecore_evas_fb_shutdown(void); #endif -#ifdef BUILD_ECORE_EVAS_BUFFER +#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER int _ecore_evas_buffer_shutdown(void); void _ecore_evas_buffer_render(Ecore_Evas *ee); #endif diff --git a/src/lib/ecore_evas/ecore_evas_quartz.c b/src/lib/ecore_evas/ecore_evas_quartz.c index 9a82caa..ee57b95 100644 --- a/src/lib/ecore_evas/ecore_evas_quartz.c +++ b/src/lib/ecore_evas/ecore_evas_quartz.c @@ -495,7 +495,7 @@ static const Ecore_Evas_Engine_Func _ecore_quartz_engine_func = }; #endif -EAPI Ecore_Evas* +EAPI Ecore_Evas * ecore_evas_quartz_new(const char* name, int w, int h) { #ifdef BUILD_ECORE_EVAS_QUARTZ diff --git a/src/lib/ecore_evas/ecore_evas_sdl.c b/src/lib/ecore_evas/ecore_evas_sdl.c index 4c6f1db..546f9a7 100644 --- a/src/lib/ecore_evas/ecore_evas_sdl.c +++ b/src/lib/ecore_evas/ecore_evas_sdl.c @@ -10,12 +10,12 @@ #include "ecore_private.h" #include "ecore_evas_private.h" #include "Ecore_Evas.h" -#ifdef BUILD_ECORE_EVAS_SDL +#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL #include "Ecore_Sdl.h" #include "Evas_Engine_SDL.h" #endif -#ifdef BUILD_ECORE_EVAS_SDL +#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL /* static char *ecore_evas_default_display = "0"; */ /* static Ecore_List *ecore_evas_input_devices = NULL; */ @@ -543,7 +543,7 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu EAPI Ecore_Evas* ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha) { -#ifdef BUILD_ECORE_EVAS_SDL +#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL Ecore_Evas *ee; int rmethod; @@ -562,7 +562,7 @@ ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, int hwsurface EAPI Ecore_Evas* ecore_evas_sdl16_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha) { -#ifdef BUILD_ECORE_EVAS_SDL +#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL Ecore_Evas *ee; int rmethod; diff --git a/src/lib/ecore_file/Makefile.am b/src/lib/ecore_file/Makefile.am index 01978f0..834bfd4 100644 --- a/src/lib/ecore_file/Makefile.am +++ b/src/lib/ecore_file/Makefile.am @@ -4,6 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_con \ -I$(top_builddir)/src/lib/ecore \ +@EFL_ECORE_FILE_BUILD@ \ @CURL_CFLAGS@ \ @EVIL_CFLAGS@ \ @EINA_CFLAGS@ \ diff --git a/src/lib/ecore_imf/Makefile.am b/src/lib/ecore_imf/Makefile.am index ba0b251..7fde0ad 100644 --- a/src/lib/ecore_imf/Makefile.am +++ b/src/lib/ecore_imf/Makefile.am @@ -4,6 +4,7 @@ if BUILD_ECORE_IMF AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ +@EFL_ECORE_IMF_BUILD@ \ @EVIL_CFLAGS@ \ @EINA_CFLAGS@ diff --git a/src/lib/ecore_imf_evas/Makefile.am b/src/lib/ecore_imf_evas/Makefile.am index e4d60a9..163054f 100644 --- a/src/lib/ecore_imf_evas/Makefile.am +++ b/src/lib/ecore_imf_evas/Makefile.am @@ -4,6 +4,7 @@ if BUILD_ECORE_IMF_EVAS AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_imf \ +@EFL_ECORE_IMF_BUILD@ \ @EVAS_CFLAGS@ \ @EINA_CFLAGS@ diff --git a/src/lib/ecore_job/Makefile.am b/src/lib/ecore_job/Makefile.am index b78d876..e46003a 100644 --- a/src/lib/ecore_job/Makefile.am +++ b/src/lib/ecore_job/Makefile.am @@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_builddir)/src/lib/ecore \ +@EFL_ECORE_JOB_BUILD@ \ @EVIL_CFLAGS@ \ @EINA_CFLAGS@ diff --git a/src/lib/ecore_quartz/Makefile.am b/src/lib/ecore_quartz/Makefile.am index 981609b..4b80cca 100644 --- a/src/lib/ecore_quartz/Makefile.am +++ b/src/lib/ecore_quartz/Makefile.am @@ -3,7 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_builddir)/src/lib/ecore \ -@QUARTZ_CFLAGS@ @EINA_CFLAGS@ +@quartz_cflags@ \ +@EINA_CFLAGS@ if BUILD_ECORE_QUARTZ @@ -12,20 +13,13 @@ include_HEADERS = \ Ecore_Quartz.h libecore_quartz_la_SOURCES = \ -Ecore_Quartz.h - -### add to SOURCES one we know how to fix: -# /usr/share/automake-1.9/am/depend2.am: am__fastdepOBJC does not appear in -# AM_CONDITIONAL -# ecore_quartz.m +ecore_quartz.m libecore_quartz_la_LIBADD = \ $(top_builddir)/src/lib/ecore/libecore.la \ -@QUARTZ_LIBS@ \ +@quartz_libs@ \ @EINA_LIBS@ -libecore_quartz_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ +libecore_quartz_la_LDFLAGS = -version-info @version_info@ endif - -EXTRA_DIST = ecore_quartz.m diff --git a/src/lib/ecore_sdl/Makefile.am b/src/lib/ecore_sdl/Makefile.am index 6552df1..2c2011b 100644 --- a/src/lib/ecore_sdl/Makefile.am +++ b/src/lib/ecore_sdl/Makefile.am @@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_builddir)/src/lib/ecore \ +@EFL_ECORE_SDL_BUILD@ \ @SDL_CFLAGS@ \ @EINA_CFLAGS@ diff --git a/src/lib/ecore_txt/Makefile.am b/src/lib/ecore_txt/Makefile.am index 4f9e931..5b60204 100644 --- a/src/lib/ecore_txt/Makefile.am +++ b/src/lib/ecore_txt/Makefile.am @@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_builddir)/src/lib/ecore \ +@EFL_ECORE_TXT_BUILD@ \ @iconv_cflags@ if BUILD_ECORE_TXT diff --git a/src/lib/ecore_win32/Makefile.am b/src/lib/ecore_win32/Makefile.am index f8ccc95..234932a 100644 --- a/src/lib/ecore_win32/Makefile.am +++ b/src/lib/ecore_win32/Makefile.am @@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_builddir)/src/lib/ecore \ +@EFL_ECORE_WIN32_BUILD@ \ @EINA_CFLAGS@ diff --git a/src/lib/ecore_wince/Makefile.am b/src/lib/ecore_wince/Makefile.am index 3d90d96..9580f1d 100644 --- a/src/lib/ecore_wince/Makefile.am +++ b/src/lib/ecore_wince/Makefile.am @@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_builddir)/src/lib/ecore \ +@EFL_ECORE_WINCE_BUILD@ \ @EINA_CFLAGS@ AM_CFLAGS = @WIN32_CFLAGS@ diff --git a/src/lib/ecore_x/xlib/Makefile.am b/src/lib/ecore_x/xlib/Makefile.am index db4c8fa..a72a88c 100644 --- a/src/lib/ecore_x/xlib/Makefile.am +++ b/src/lib/ecore_x/xlib/Makefile.am @@ -5,7 +5,7 @@ if BUILD_ECORE_X_XLIB AM_CPPFLAGS = \ @Xcursor_cflags@ \ -@Xkb_cflags@ \ +@XKB_CFLAGS@ \ @XDAMAGE_CFLAGS@ \ @XCOMPOSITE_CFLAGS@ \ @XDPMS_CFLAGS@ \ @@ -57,7 +57,7 @@ ecore_x_atoms.c libecore_x_xlib_la_LIBADD = \ @Xcursor_libs@ \ -@Xkb_libs@ \ +@XKB_LIBS@ \ @XDAMAGE_LIBS@ \ @XCOMPOSITE_LIBS@ \ @XDPMS_LIBS@ \ -- 2.7.4