summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorChristopher Michael <cpmichael1@comcast.net>2012-06-06 13:55:15 +0000
committerChristopher Michael <cpmichael1@comcast.net>2012-06-06 13:55:15 +0000
commitab9fe7a2db121a9d467442c7f153bad3a2876a68 (patch)
tree6e1ddc44521fa84edfe71a9fe739c0f43e08517b /configure.ac
parentca4c2adbf65599367eb867a8302672d056d5d7ff (diff)
Elm: Patches from Rob Bradford <rob@linux.intel.com> to:
* Move X related window items into their own substruct of _Elm_Win_Smart_Data to allow grouping based on engine. * Move X related cursor items into their own substruct of Elm_Cursor to make supporting cursors on other platforms cleaner. * Add support for setting the cursor under Wayland: * Introduce a configure option and #define to as per other engines * Add always-built API function to allow identification of running under Wayland (like for X11) * Call into Ecore to set the cursor when the mouse enters the desired widget. SVN revision: 71754
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac24
1 files changed, 24 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 7b5785ade..27ca5977c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -444,6 +444,29 @@ if test "x$want_elementary_wince" = "xyes" -a "x$have_elementary_wince" = "xno";
444 AC_MSG_ERROR([ecore-wince support requested, but not found by pkg-config.]) 444 AC_MSG_ERROR([ecore-wince support requested, but not found by pkg-config.])
445fi 445fi
446 446
447have_elementary_wayland="no"
448want_elementary_wayland="auto"
449AC_ARG_ENABLE([ecore-x],
450 [AC_HELP_STRING([--disable-ecore-wayland], [disable ecore-wayland support. @<:@default=detect@:>@])],
451 [want_elementary_wayland=$enableval], [])
452
453if test "x$want_elementary_wayland" != "xno"; then
454 PKG_CHECK_MODULES([ELEMENTARY_WAYLAND],
455 [ecore-wayland],
456 [
457 AC_DEFINE(HAVE_ELEMENTARY_WAYLAND, 1, [Wayland support for Elementary])
458 have_elementary_wayland="yes"
459 requirement_elm="ecore-wayland ${requirement_elm}"
460 ],
461 [have_elementary_wayland="no"]
462 )
463else
464 have_elementary_wayland="no"
465fi
466if test "x$want_elementary_wayland" = "xyes" -a "x$have_elementary_wayland" = "xno"; then
467 AC_MSG_ERROR([ecore-x support requested, but not found by pkg-config.])
468fi
469
447ELM_EDBUS_DEF="#undef" 470ELM_EDBUS_DEF="#undef"
448have_elementary_edbus="no" 471have_elementary_edbus="no"
449want_elementary_edbus="auto" 472want_elementary_edbus="auto"
@@ -752,6 +775,7 @@ echo " SDL....................: ${have_elementary_sdl}"
752echo " Cocoa..................: ${have_elementary_cocoa}" 775echo " Cocoa..................: ${have_elementary_cocoa}"
753echo " Windows XP.............: ${have_elementary_win32}" 776echo " Windows XP.............: ${have_elementary_win32}"
754echo " Windows CE.............: ${have_elementary_wince}" 777echo " Windows CE.............: ${have_elementary_wince}"
778echo " Wayland...............:. ${have_elementary_wayland}"
755echo 779echo
756echo " Features:" 780echo " Features:"
757echo " Ecore_IMF..............: ${have_ecore_imf}" 781echo " Ecore_IMF..............: ${have_ecore_imf}"