summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorEduardo de Barros Lima <eblima@gmail.com>2012-12-06 13:01:21 +0000
committerEduardo de Barros Lima <eblima@gmail.com>2012-12-06 13:01:21 +0000
commite3178a936d09c417ad9935c2304bf211fe8de345 (patch)
treea97c2c5d63622afb89ecd2c10b2c8442f572009e /configure.ac
parenta46d793b24102533365f54a4219b740ada0a9041 (diff)
Reverting 80354: "Avoid calling test so many times. Use -a/-o instead."
SVN revision: 80357
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac102
1 files changed, 51 insertions, 51 deletions
diff --git a/configure.ac b/configure.ac
index 59d4fe9..403c20f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -851,7 +851,7 @@ else
851fi 851fi
852 852
853AC_DEFINE_IF([EINA_DEBUG_MALLOC], 853AC_DEFINE_IF([EINA_DEBUG_MALLOC],
854 [test "x${ac_cv_func_malloc_usable_size}" = "xyes" -a "x${want_debug_malloc}" = "xyes"], 854 [test "x${ac_cv_func_malloc_usable_size}" = "xyes" && test "x${want_debug_malloc}" = "xyes"],
855 [1], [Turn on debugging overhead in mempool]) 855 [1], [Turn on debugging overhead in mempool])
856 856
857if ! test "x${requirements_pc_deps_eina}" = "x" ; then 857if ! test "x${requirements_pc_deps_eina}" = "x" ; then
@@ -916,7 +916,7 @@ EFL_CHECK_LINKER_FLAGS([EINA], [-fno-strict-aliasing])
916EFL_CHECK_FUNCS([EINA], [dirfd dlopen dladdr iconv shm_open setxattr]) 916EFL_CHECK_FUNCS([EINA], [dirfd dlopen dladdr iconv shm_open setxattr])
917 917
918enable_log="no" 918enable_log="no"
919if test "x${efl_func_fnmatch}" = "xyes" -a "x${want_log}" = "xyes" ; then 919if test "x${efl_func_fnmatch}" = "xyes" && test "x${want_log}" = "xyes" ; then
920 enable_log="yes" 920 enable_log="yes"
921fi 921fi
922 922
@@ -980,7 +980,7 @@ fi
980EFL_CHECK_LIBS([EET], [libjpeg zlib]) 980EFL_CHECK_LIBS([EET], [libjpeg zlib])
981 981
982# TODO: better way to force those instead of is secondary check 982# TODO: better way to force those instead of is secondary check
983if test "x${efl_lib_zlib}" != "xyes" -o "x${efl_lib_libjpeg}" != "xyes" ; then 983if test "x${efl_lib_zlib}" != "xyes" || test "x${efl_lib_libjpeg}" != "xyes" ; then
984 AC_MSG_ERROR([Required EET libraries were not found.]) 984 AC_MSG_ERROR([Required EET libraries were not found.])
985fi 985fi
986 986
@@ -1490,7 +1490,7 @@ fi
1490# harfbuzz support 1490# harfbuzz support
1491have_harfbuzz="no" 1491have_harfbuzz="no"
1492have_harfbuzz_ft="no" 1492have_harfbuzz_ft="no"
1493if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then 1493if test "x${want_harfbuzz}" = "xyes" || test "x${want_harfbuzz}" = "xauto" ; then
1494 PKG_CHECK_EXISTS([harfbuzz >= 0.9.0], 1494 PKG_CHECK_EXISTS([harfbuzz >= 0.9.0],
1495 [ 1495 [
1496 have_harfbuzz="yes" 1496 have_harfbuzz="yes"
@@ -1498,7 +1498,7 @@ if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then
1498 requirements_pc_deps_evas="harfbuzz >= 0.9.0 ${requirements_pc_deps_evas}" 1498 requirements_pc_deps_evas="harfbuzz >= 0.9.0 ${requirements_pc_deps_evas}"
1499 ], 1499 ],
1500 [ 1500 [
1501 if test "x$want_harfbuzz" = "xyes" -a "x$use_strict" = "xyes" ; then 1501 if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then
1502 AC_MSG_ERROR([Harfbuzz not found (strict dependencies checking)]) 1502 AC_MSG_ERROR([Harfbuzz not found (strict dependencies checking)])
1503 fi 1503 fi
1504 ]) 1504 ])
@@ -1510,7 +1510,7 @@ fi
1510 1510
1511# Pixman 1511# Pixman
1512have_pixman="no" 1512have_pixman="no"
1513if test "x${want_pixman}" = "xyes" -o "x${want_pixman}" = "xauto" ; then 1513if test "x${want_pixman}" = "xyes" || test "x${want_pixman}" = "xauto" ; then
1514 PKG_CHECK_EXISTS([pixman-1], 1514 PKG_CHECK_EXISTS([pixman-1],
1515 [ 1515 [
1516 have_pixman="yes" 1516 have_pixman="yes"
@@ -1587,16 +1587,16 @@ AC_MSG_RESULT([${have_evas_engine_software_xlib}])
1587# If software_x11 is available, define everything needed for X11 1587# If software_x11 is available, define everything needed for X11
1588 1588
1589have_evas_engine_software_x11="no" 1589have_evas_engine_software_x11="no"
1590if test "x${have_evas_engine_software_xlib}" = "xyes" -o "x${have_evas_engine_software_xlib}" = "xstatic" -o "x${have_evas_engine_software_xcb}" = "xyes" -o "x${have_evas_engine_software_xcb}" = "xstatic" ; then 1590if test "x${have_evas_engine_software_xlib}" = "xyes" || test "x${have_evas_engine_software_xlib}" = "xstatic" || test "x${have_evas_engine_software_xcb}" = "xyes" || test "x${have_evas_engine_software_xcb}" = "xstatic" ; then
1591 have_evas_engine_software_x11="yes" 1591 have_evas_engine_software_x11="yes"
1592 AC_DEFINE_UNQUOTED([BUILD_ENGINE_SOFTWARE_X11], [1], [Build software X11 engine]) 1592 AC_DEFINE_UNQUOTED([BUILD_ENGINE_SOFTWARE_X11], [1], [Build software X11 engine])
1593fi 1593fi
1594AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_X11], [test "x${have_evas_engine_software_x11}" = "xyes"]) 1594AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_X11], [test "x${have_evas_engine_software_x11}" = "xyes"])
1595 1595
1596if test "x${have_evas_engine_software_xlib}" = "xstatic" -o "x${have_evas_engine_software_xcb}" = "xstatic"; then 1596if test "x${have_evas_engine_software_xlib}" = "xstatic" || test "x${have_evas_engine_software_xcb}" = "xstatic"; then
1597 AC_DEFINE_UNQUOTED([EVAS_STATIC_BUILD_SOFTWARE_X11], [1], [Build software X11 engine as part of libevas]) 1597 AC_DEFINE_UNQUOTED([EVAS_STATIC_BUILD_SOFTWARE_X11], [1], [Build software X11 engine as part of libevas])
1598fi 1598fi
1599AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [test "x${have_evas_engine_software_xcb}" = "xstatic" -o "x${have_evas_engine_software_xlib}" = "xstatic"]) 1599AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [test "x${have_evas_engine_software_xcb}" = "xstatic" || test "x${have_evas_engine_software_xlib}" = "xstatic"])
1600 1600
1601# Needed for evas-software-x11.pc 1601# Needed for evas-software-x11.pc
1602 1602
@@ -1608,7 +1608,7 @@ AC_SUBST([have_evas_engine_software_xcb])
1608AC_MSG_CHECKING([Whether to build software generic engine as part of libevas]) 1608AC_MSG_CHECKING([Whether to build software generic engine as part of libevas])
1609AC_MSG_RESULT([${have_static_software_generic}]) 1609AC_MSG_RESULT([${have_static_software_generic}])
1610 1610
1611if test "x${have_static_module}" = "xyes" -a "x${have_static_software_generic}" = "xno"; then 1611if test "x${have_static_module}" = "xyes" && test "x${have_static_software_generic}" = "xno"; then
1612 AC_MSG_WARN([Forcing --enable-static-software-generic as engines must be compiled statically]) 1612 AC_MSG_WARN([Forcing --enable-static-software-generic as engines must be compiled statically])
1613 have_static_software_generic="yes" 1613 have_static_software_generic="yes"
1614fi 1614fi
@@ -1657,16 +1657,16 @@ AC_MSG_RESULT([${have_evas_engine_gl_xlib}])
1657# If opengl_x11 is available, define everything needed for X11 1657# If opengl_x11 is available, define everything needed for X11
1658 1658
1659have_evas_engine_gl_x11="no" 1659have_evas_engine_gl_x11="no"
1660if test "x${have_evas_engine_gl_xlib}" = "xyes" -o "x${have_evas_engine_gl_xlib}" = "xstatic" -o "x${have_evas_engine_gl_xcb}" = "xyes" -o "x${have_evas_engine_gl_xcb}" = "xstatic" ; then 1660if test "x${have_evas_engine_gl_xlib}" = "xyes" || test "x${have_evas_engine_gl_xlib}" = "xstatic" || test "x${have_evas_engine_gl_xcb}" = "xyes" || test "x${have_evas_engine_gl_xcb}" = "xstatic" ; then
1661 have_evas_engine_gl_x11="yes" 1661 have_evas_engine_gl_x11="yes"
1662 AC_DEFINE_UNQUOTED([BUILD_ENGINE_GL_X11], [1], [Build OpenGL X11 engine]) 1662 AC_DEFINE_UNQUOTED([BUILD_ENGINE_GL_X11], [1], [Build OpenGL X11 engine])
1663fi 1663fi
1664AM_CONDITIONAL([BUILD_ENGINE_GL_X11], [test "x${have_evas_engine_gl_x11}" = "xyes"]) 1664AM_CONDITIONAL([BUILD_ENGINE_GL_X11], [test "x${have_evas_engine_gl_x11}" = "xyes"])
1665 1665
1666if test "x${have_evas_engine_gl_xlib}" = "xstatic" -o "x${have_evas_engine_gl_xcb}" = "xstatic"; then 1666if test "x${have_evas_engine_gl_xlib}" = "xstatic" || test "x${have_evas_engine_gl_xcb}" = "xstatic"; then
1667 AC_DEFINE_UNQUOTED([EVAS_STATIC_BUILD_GL_X11], [1], [Build OpenGL X11 engine as part of libevas]) 1667 AC_DEFINE_UNQUOTED([EVAS_STATIC_BUILD_GL_X11], [1], [Build OpenGL X11 engine as part of libevas])
1668fi 1668fi
1669AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_X11], [test "x${have_evas_engine_gl_xcb}" = "xstatic" -o "x${have_evas_engine_gl_xlib}" = "xstatic"]) 1669AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_X11], [test "x${have_evas_engine_gl_xcb}" = "xstatic" || test "x${have_evas_engine_gl_xlib}" = "xstatic"])
1670 1670
1671# Needed for evas-opengl-x11.pc 1671# Needed for evas-opengl-x11.pc
1672 1672
@@ -1675,7 +1675,7 @@ AC_SUBST([have_evas_engine_gl_xcb])
1675 1675
1676# OpenGL SDL 1676# OpenGL SDL
1677 1677
1678if test "x$have_evas_engine_gl_sdl" = "xyes" -o "x$have_evas_engine_gl_sdl" = "xstatic" ; then 1678if test "x$have_evas_engine_gl_sdl" = "xyes" || test "x$have_evas_engine_gl_sdl" = "xstatic" ; then
1679 AC_CHECK_DECL([SDL_GL_CONTEXT_MAJOR_VERSION], 1679 AC_CHECK_DECL([SDL_GL_CONTEXT_MAJOR_VERSION],
1680 [AC_DEFINE([HAVE_SDL_GL_CONTEXT_VERSION], [1], [SDL_GL version attributes present])],, 1680 [AC_DEFINE([HAVE_SDL_GL_CONTEXT_VERSION], [1], [SDL_GL version attributes present])],,
1681 [#include <SDL/SDL_video.h>]) 1681 [#include <SDL/SDL_video.h>])
@@ -1695,18 +1695,18 @@ AC_SUBST([evas_engine_gl_common_libs])
1695 1695
1696have_evas_engine_gl_common="no" 1696have_evas_engine_gl_common="no"
1697have_static_evas_engine_gl_common="no" 1697have_static_evas_engine_gl_common="no"
1698if test "x$have_evas_engine_gl_xlib" = "xyes" -o \ 1698if test "x$have_evas_engine_gl_xlib" = "xyes" || \
1699 "x$have_evas_engine_gl_xcb" = "xyes" -o \ 1699 test "x$have_evas_engine_gl_xcb" = "xyes" || \
1700 "x$have_evas_engine_gl_sdl" = "xyes" -o \ 1700 test "x$have_evas_engine_gl_sdl" = "xyes" || \
1701 "x$have_evas_engine_gl_cocoa" = "xyes" -o \ 1701 test "x$have_evas_engine_gl_cocoa" = "xyes" || \
1702 "x$have_evas_engine_wayland_egl" = "xyes"; then 1702 test "x$have_evas_engine_wayland_egl" = "xyes"; then
1703 have_evas_engine_gl_common="yes" 1703 have_evas_engine_gl_common="yes"
1704fi 1704fi
1705if test "x$have_evas_engine_gl_xlib" = "xstatic" -o \ 1705if test "x$have_evas_engine_gl_xlib" = "xstatic" || \
1706 "x$have_evas_engine_gl_xcb" = "xstatic" -o \ 1706 test "x$have_evas_engine_gl_xcb" = "xstatic" || \
1707 "x$have_evas_engine_gl_sdl" = "xstatic" -o \ 1707 test "x$have_evas_engine_gl_sdl" = "xstatic" || \
1708 "x$have_evas_engine_gl_cocoa" = "xstatic" -o \ 1708 test "x$have_evas_engine_gl_cocoa" = "xstatic" || \
1709 "x$have_evas_engine_wayland_egl" = "xstatic"; then 1709 test "x$have_evas_engine_wayland_egl" = "xstatic"; then
1710 have_evas_engine_gl_common="yes" 1710 have_evas_engine_gl_common="yes"
1711 have_static_evas_engine_gl_common="yes" 1711 have_static_evas_engine_gl_common="yes"
1712fi 1712fi
@@ -1757,7 +1757,7 @@ case "$host_os" in
1757 mingw*) 1757 mingw*)
1758 ;; 1758 ;;
1759 *) 1759 *)
1760 if test "x${have_evas_image_loader_jpeg}" = "xyes" -o "x${have_evas_image_loader_jpeg}" = "xstatic"; then 1760 if test "x${have_evas_image_loader_jpeg}" = "xyes" || test "x${have_evas_image_loader_jpeg}" = "xstatic"; then
1761 AC_DEFINE([EVAS_BUILD_SAVER_JPEG], [1], [Build JPEG saver]) 1761 AC_DEFINE([EVAS_BUILD_SAVER_JPEG], [1], [Build JPEG saver])
1762 have_evas_image_saver_jpeg="yes" 1762 have_evas_image_saver_jpeg="yes"
1763 fi 1763 fi
@@ -1785,7 +1785,7 @@ if test "x$have_harfbuzz" = "xyes" ; then
1785 AC_DEFINE([HAVE_HARFBUZZ], [1], [have harfbuzz support]) 1785 AC_DEFINE([HAVE_HARFBUZZ], [1], [have harfbuzz support])
1786 ], 1786 ],
1787 [ 1787 [
1788 if test "x$want_harfbuzz" = "xyes" -a "x$use_strict" = "xyes" ; then 1788 if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then
1789 AC_MSG_ERROR([Harfbuzz-ft not found (strict dependencies checking)]) 1789 AC_MSG_ERROR([Harfbuzz-ft not found (strict dependencies checking)])
1790 fi 1790 fi
1791 have_harfbuzz="no" 1791 have_harfbuzz="no"
@@ -1819,7 +1819,7 @@ if test "x${res}" = "xyes" ; then
1819 AC_DEFINE([HAVE_LROUND], [1], [C99 lround function exists]) 1819 AC_DEFINE([HAVE_LROUND], [1], [C99 lround function exists])
1820fi 1820fi
1821 1821
1822if test "x${want_evas_image_loader_generic}" = "xyes" -o "x${want_evas_cserve2}" = "xyes" ; then 1822if test "x${want_evas_image_loader_generic}" = "xyes" || test "x${want_evas_cserve2}" = "xyes" ; then
1823 EFL_CHECK_FUNC([EVAS], [shm_open]) 1823 EFL_CHECK_FUNC([EVAS], [shm_open])
1824fi 1824fi
1825 1825
@@ -1976,12 +1976,12 @@ case "$host_os" in
1976esac 1976esac
1977 1977
1978want_glib="no" 1978want_glib="no"
1979if test "x${with_glib}" = "xyes" -o "x${with_glib}" = "xalways" ; then 1979if test "x${with_glib}" = "xyes" || test "x${with_glib}" = "xalways" ; then
1980 want_glib="yes" 1980 want_glib="yes"
1981fi 1981fi
1982 1982
1983want_ecore_timer_dump="no" 1983want_ecore_timer_dump="no"
1984if test "x${build_profile}" = "xdebug" -a "x${ac_cv_func_backtrace}" = "xyes"; then 1984if test "x${build_profile}" = "xdebug" && test "x${ac_cv_func_backtrace}" = "xyes"; then
1985 want_ecore_timer_dump="yes" 1985 want_ecore_timer_dump="yes"
1986 AC_DEFINE([WANT_ECORE_TIMER_DUMP], [1], [Want Ecore_Timer dump infrastructure]) 1986 AC_DEFINE([WANT_ECORE_TIMER_DUMP], [1], [Want Ecore_Timer dump infrastructure])
1987fi 1987fi
@@ -2015,7 +2015,7 @@ if test "x${want_glib}" = "xyes" ; then
2015 PKG_CHECK_EXISTS([glib-2.0], [have_glib="yes"], [have_glib="no"]) 2015 PKG_CHECK_EXISTS([glib-2.0], [have_glib="yes"], [have_glib="no"])
2016fi 2016fi
2017 2017
2018if test "x${want_glib}" = "xyes" -a "x${have_glib}" = "xno"; then 2018if test "x${want_glib}" = "xyes" && test "x${have_glib}" = "xno"; then
2019 AC_MSG_ERROR([GLib support requested, but no GLib found by pkg-config.]) 2019 AC_MSG_ERROR([GLib support requested, but no GLib found by pkg-config.])
2020elif test "x${have_glib}" = "xyes" ; then 2020elif test "x${have_glib}" = "xyes" ; then
2021 AC_DEFINE([HAVE_GLIB], [1], [Have GLib]) 2021 AC_DEFINE([HAVE_GLIB], [1], [Have GLib])
@@ -2027,7 +2027,7 @@ if test "x${have_glib}" = "xno"; then
2027 want_g_main_loop="no" 2027 want_g_main_loop="no"
2028fi 2028fi
2029 2029
2030if test "x${with_glib}" = "xalways" -a "x${want_g_main_loop}" = "xyes"; then 2030if test "x${with_glib}" = "xalways" && test "x${want_g_main_loop}" = "xyes"; then
2031 AC_MSG_ERROR([--with-glib set to always and --enable-glib-main-loop are mutually exclusive]) 2031 AC_MSG_ERROR([--with-glib set to always and --enable-glib-main-loop are mutually exclusive])
2032fi 2032fi
2033 2033
@@ -2280,7 +2280,7 @@ AC_CHECK_HEADERS([sys/un.h], [], [],
2280]) 2280])
2281AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h netinet/tcp.h netinet/in.h ws2tcpip.h netdb.h]) 2281AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h netinet/tcp.h netinet/in.h ws2tcpip.h netdb.h])
2282 2282
2283if test "x${ac_cv_header_netdb_h}" = "xno" -a "x${have_windows}" = "xno"; then 2283if test "x${ac_cv_header_netdb_h}" = "xno" && test "x${have_windows}" = "xno"; then
2284 AC_MSG_ERROR([netdb.h is requested to have Ecore_Con. Exiting...]) 2284 AC_MSG_ERROR([netdb.h is requested to have Ecore_Con. Exiting...])
2285fi 2285fi
2286 2286
@@ -3162,7 +3162,7 @@ if test "x${have_ecore_x_xlib}" = "xyes" ; then
3162 have_ecore_x="yes" 3162 have_ecore_x="yes"
3163fi 3163fi
3164 3164
3165if test "x${have_ecore_x_xlib}" = "xyes" -a "x$want_ecore_x_cursor" = "xyes" ; then 3165if test "x${have_ecore_x_xlib}" = "xyes" && test "x$want_ecore_x_cursor" = "xyes" ; then
3166 AC_CHECK_LIB([Xcursor], 3166 AC_CHECK_LIB([Xcursor],
3167 [XcursorImageLoadCursor], 3167 [XcursorImageLoadCursor],
3168 [ 3168 [
@@ -3520,7 +3520,7 @@ requirements_pc_ecore_imf_evas="ecore_imf >= ${PACKAGE_VERSION} ecore >= ${PACKA
3520# ibus 3520# ibus
3521 3521
3522have_ecore_imf_ibus="no" 3522have_ecore_imf_ibus="no"
3523if test "x${want_ecore_imf_ibus}" = "xyes" -a "x${have_glib}" = "xyes" ; then 3523if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; then
3524 PKG_CHECK_MODULES([IBUS], 3524 PKG_CHECK_MODULES([IBUS],
3525 [ibus-1.0 >= 1.4], 3525 [ibus-1.0 >= 1.4],
3526 [ 3526 [
@@ -3551,7 +3551,7 @@ AM_CONDITIONAL([BUILD_ECORE_IMF_SCIM], [test "x${have_ecore_imf_scim}" = "xyes"]
3551# xim 3551# xim
3552 3552
3553have_ecore_imf_xim="no" 3553have_ecore_imf_xim="no"
3554if test "x${want_xim}" = "xyes" -a "x${want_ecore_imf_xim}" = "xyes" ; then 3554if test "x${want_xim}" = "xyes" && test "x${want_ecore_imf_xim}" = "xyes" ; then
3555 have_ecore_imf_xim="yes" 3555 have_ecore_imf_xim="yes"
3556 AC_DEFINE([ENABLE_XIM], [1], [Enable X Input Method]) 3556 AC_DEFINE([ENABLE_XIM], [1], [Enable X Input Method])
3557fi 3557fi
@@ -3665,18 +3665,18 @@ ECORE_EVAS_CHECK_MODULE_FULL([ews],
3665 3665
3666# ecore_evas_extn 3666# ecore_evas_extn
3667 3667
3668if test "x${have_ecore_ipc}" = "xno" -o \ 3668if test "x${have_ecore_ipc}" = "xno" || \
3669 "x${have_ecore_evas_software_buffer}" = "xno" -o \ 3669 test "x${have_ecore_evas_software_buffer}" = "xno" || \
3670 "x${have_shm_open}" = "xno" -o \ 3670 test "x${have_shm_open}" = "xno" || \
3671 "x${have_windows}" = "xyes" ; then 3671 test "x${have_windows}" = "xyes" ; then
3672 have_extn="no" 3672 have_extn="no"
3673fi 3673fi
3674 3674
3675dnl THIS IS SPECIAL - dont use normal ECORE_EVAS_CHECK_MODULE 3675dnl THIS IS SPECIAL - dont use normal ECORE_EVAS_CHECK_MODULE
3676have_ecore_evas_extn="no" 3676have_ecore_evas_extn="no"
3677if test "x${want_ecore_evas_extn}" = "xyes" -a \ 3677if test "x${want_ecore_evas_extn}" = "xyes" && \
3678 "x${have_extn}" = "xyes" -a \ 3678 test "x${have_extn}" = "xyes" && \
3679 "x${have_ecore_evas}" = "xyes"; then 3679 test "x${have_ecore_evas}" = "xyes"; then
3680 have_ecore_evas_extn="yes" 3680 have_ecore_evas_extn="yes"
3681 AC_DEFINE([BUILD_ECORE_EVAS_EXTN], [1], [Support for Extn Engine in Ecore_Evas]) 3681 AC_DEFINE([BUILD_ECORE_EVAS_EXTN], [1], [Support for Extn Engine in Ecore_Evas])
3682 requirements_pc_ecore_evas="ecore-ipc >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}" 3682 requirements_pc_ecore_evas="ecore-ipc >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
@@ -3750,8 +3750,8 @@ ECORE_EVAS_CHECK_MODULE_FULL([software-ddraw],
3750 [Software DirectDraw], 3750 [Software DirectDraw],
3751 [${have_win32}]) 3751 [${have_win32}])
3752 3752
3753if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \ 3753if test "x${have_ecore_evas_software_gdi}" = "xyes" || \
3754 "x${have_ecore_evas_software_ddraw}" = "xyes" ; then 3754 test "x${have_ecore_evas_software_ddraw}" = "xyes" ; then
3755 AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas]) 3755 AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas])
3756 requirements_pc_ecore_evas="ecore-win32 >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}" 3756 requirements_pc_ecore_evas="ecore-win32 >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
3757fi 3757fi
@@ -3771,14 +3771,14 @@ if test "x$have_ecore_evas_software_x11" = "xyes" ; then
3771 if test "x${have_ecore_evas_software_xlib}" = "xstatic"; then 3771 if test "x${have_ecore_evas_software_xlib}" = "xstatic"; then
3772 have_ecore_evas_software_xlib="yes" 3772 have_ecore_evas_software_xlib="yes"
3773 fi 3773 fi
3774 if test "x${have_ecore_evas_software_xlib}" = "xyes" -a "x${have_ecore_x_xlib}" = "xyes" ; then 3774 if test "x${have_ecore_evas_software_xlib}" = "xyes" && test "x${have_ecore_x_xlib}" = "xyes" ; then
3775 AC_DEFINE([BUILD_ECORE_EVAS_SOFTWARE_XLIB], [1], [Evas Software Xlib Engine Support]) 3775 AC_DEFINE([BUILD_ECORE_EVAS_SOFTWARE_XLIB], [1], [Evas Software Xlib Engine Support])
3776 fi 3776 fi
3777 have_ecore_evas_software_xcb=`${PKG_CONFIG} --variable=XCB evas-software-x11` 3777 have_ecore_evas_software_xcb=`${PKG_CONFIG} --variable=XCB evas-software-x11`
3778 if test "x$have_ecore_evas_software_xcb" = "xstatic"; then 3778 if test "x$have_ecore_evas_software_xcb" = "xstatic"; then
3779 have_ecore_evas_software_xcb="yes" 3779 have_ecore_evas_software_xcb="yes"
3780 fi 3780 fi
3781 if test "x$have_ecore_evas_software_xcb" = "xyes" -a "x${have_ecore_x_xcb}" = "xyes" ; then 3781 if test "x$have_ecore_evas_software_xcb" = "xyes" && test "x${have_ecore_x_xcb}" = "xyes" ; then
3782 AC_DEFINE([BUILD_ECORE_EVAS_SOFTWARE_XCB], [1], [Evas Software XCB Engine Support]) 3782 AC_DEFINE([BUILD_ECORE_EVAS_SOFTWARE_XCB], [1], [Evas Software XCB Engine Support])
3783 fi 3783 fi
3784fi 3784fi
@@ -3793,7 +3793,7 @@ ECORE_EVAS_CHECK_MODULE_FULL([opengl-x11],
3793 3793
3794have_ecore_evas_opengl_xlib="no" 3794have_ecore_evas_opengl_xlib="no"
3795have_ecore_evas_opengl_xcb="no" 3795have_ecore_evas_opengl_xcb="no"
3796if test "x${have_ecore_evas_opengl_x11}" = "xyes" -o "x${have_ecore_evas_opengl_x11}" = "xstatic" ; then 3796if test "x${have_ecore_evas_opengl_x11}" = "xyes" || test "x${have_ecore_evas_opengl_x11}" = "xstatic" ; then
3797 have_ecore_evas_opengl_xlib=`${PKG_CONFIG} --variable=Xlib evas-opengl-x11` 3797 have_ecore_evas_opengl_xlib=`${PKG_CONFIG} --variable=Xlib evas-opengl-x11`
3798 if test "x${have_ecore_evas_opengl_xlib}" = "xyes" ; then 3798 if test "x${have_ecore_evas_opengl_xlib}" = "xyes" ; then
3799 AC_DEFINE([BUILD_ECORE_EVAS_OPENGL_XLIB], [1], [OpenGL Xlib rendering backend]) 3799 AC_DEFINE([BUILD_ECORE_EVAS_OPENGL_XLIB], [1], [OpenGL Xlib rendering backend])
@@ -3804,7 +3804,7 @@ if test "x${have_ecore_evas_opengl_x11}" = "xyes" -o "x${have_ecore_evas_opengl_
3804 if test "x${have_ecore_evas_opengl_xcb}" = "xstatic"; then 3804 if test "x${have_ecore_evas_opengl_xcb}" = "xstatic"; then
3805 have_ecore_evas_opengl_xcb="yes" 3805 have_ecore_evas_opengl_xcb="yes"
3806 fi 3806 fi
3807 if test "x${have_ecore_evas_opengl_xcb}" = "xyes" -a "x${have_ecore_x_xcb}" = "xyes" ; then 3807 if test "x${have_ecore_evas_opengl_xcb}" = "xyes" && test "x${have_ecore_x_xcb}" = "xyes" ; then
3808 PKG_CHECK_MODULES([XCB_X11], 3808 PKG_CHECK_MODULES([XCB_X11],
3809 [x11-xcb], 3809 [x11-xcb],
3810 [ 3810 [
@@ -3820,9 +3820,9 @@ if test "x${have_ecore_evas_opengl_x11}" = "xyes" -o "x${have_ecore_evas_opengl_
3820 fi 3820 fi
3821fi 3821fi
3822 3822
3823if test "x$have_ecore_evas_software_x11" = "xyes" -o \ 3823if test "x$have_ecore_evas_software_x11" = "xyes" || \
3824 "x$have_ecore_evas_opengl_x11" = "xyes" -o \ 3824 test "x$have_ecore_evas_opengl_x11" = "xyes" || \
3825 "x$have_ecore_evas_software_xcb" = "xyes"; then 3825 test "x$have_ecore_evas_software_xcb" = "xyes"; then
3826 AC_DEFINE([BUILD_ECORE_EVAS_X11], [1], [Support for X Window Engines in Ecore_Evas]) 3826 AC_DEFINE([BUILD_ECORE_EVAS_X11], [1], [Support for X Window Engines in Ecore_Evas])
3827 requirements_pc_ecore_evas="ecore-x >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}" 3827 requirements_pc_ecore_evas="ecore-x >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
3828fi 3828fi