summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-07 23:16:43 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-07 23:16:43 +0000
commitc6e0c9588343fa78799904bbd7fa42caff1c381b (patch)
tree3462ca100642b2cb2382e3f243b0f0ab564e8915
parent6988d2685b483b9f28e9b99300fd30ac5b40161d (diff)
efl: almost final ecore/evas/ecore-evas options integration.
Many changes in this commit, but overall it should work. If not let me know. * ECORE_CHECK_X_EXTENSION() will now fail if Xlib extension is not found. * remove usage of ECORE_EVAS_CHECK_MODULE(), using the simplified ECORE_EVAS_MODULE() * EVAS_CHECK_ENGINE() will not declare an option anymore. * fixed --with-x11 and --with-opengl regarding defaults. * fixed typo in EVAS_STATIC_BUILD_SOFTWARE_X11 -> XLIB conditional * simplified Xi2 and Xgestures support under --enable-gesture. Let me know if these should be checked separately. * remove every other X extension option, they are all forced by now. If no major showstopper appears with this we may remove all the #ifdef in the code! If there is something broken, let me know. Next on the list for the weekend is to finish the option checks for SDL, Wayland-EGL, Cocoa and similar. SVN revision: 80505
-rw-r--r--configure.ac527
-rw-r--r--m4/ecore_check_c_extension.m431
-rw-r--r--m4/ecore_check_module.m448
-rw-r--r--m4/evas_check_engine.m416
4 files changed, 99 insertions, 523 deletions
diff --git a/configure.ac b/configure.ac
index e50bf69fbf..0c713deeee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1062,16 +1062,16 @@ AC_MSG_NOTICE([Evas checks])
1062### Additional options to configure 1062### Additional options to configure
1063 1063
1064# X11 1064# X11
1065AC_ARG_WITH([x11],
1066 [AC_HELP_STRING([--with-x11=xlib|xcb|none],
1067 [X11 method to use: xlib, xcb or none])])
1068
1065if test "x${have_windows}" = "xyes" || test "x${have_ps3}" = "xyes"; then 1069if test "x${have_windows}" = "xyes" || test "x${have_ps3}" = "xyes"; then
1066 with_x11="none" 1070 with_x11="none"
1067else 1071elif test "x${with_x11}" = "x"; then
1068 with_x11="xlib" 1072 with_x11="xlib"
1069fi 1073fi
1070 1074
1071AC_ARG_WITH([x11],
1072 [AC_HELP_STRING([--with-x11=xlib|xcb|none],
1073 [X11 method to use: xlib, xcb or none])])
1074
1075want_x11_xlib="no" 1075want_x11_xlib="no"
1076want_x11_xcb="no" 1076want_x11_xcb="no"
1077want_x11_none="no" 1077want_x11_none="no"
@@ -1094,16 +1094,16 @@ case "${with_x11}" in
1094esac 1094esac
1095 1095
1096# OpenGL 1096# OpenGL
1097AC_ARG_WITH([opengl],
1098 [AC_HELP_STRING([--with-opengl=full|es|none],
1099 [OpenGL method to use: full, es or none])])
1100
1097if test "x${have_windows}" = "xyes" || test "x${have_ps3}" = "xyes"; then 1101if test "x${have_windows}" = "xyes" || test "x${have_ps3}" = "xyes"; then
1098 with_opengl="none" 1102 with_opengl="none"
1099else 1103elif test "x${with_opengl}" = "x"; then
1100 with_opengl="full" 1104 with_opengl="full"
1101fi 1105fi
1102 1106
1103AC_ARG_WITH([opengl],
1104 [AC_HELP_STRING([--with-opengl=full|es|none],
1105 [OpenGL method to use: full, es or none])])
1106
1107case "${with_opengl}" in 1107case "${with_opengl}" in
1108 full|es|none) 1108 full|es|none)
1109 ;; 1109 ;;
@@ -1410,7 +1410,7 @@ case "$host_os" in
1410 want_evas_engine_software_ddraw="yes" 1410 want_evas_engine_software_ddraw="yes"
1411 ;; 1411 ;;
1412 darwin*) 1412 darwin*)
1413 want_evas_engine_gl_cocoa="auto" 1413 want_evas_engine_gl_cocoa="yes"
1414 ;; 1414 ;;
1415 *) 1415 *)
1416 ;; 1416 ;;
@@ -1527,7 +1527,7 @@ if test "x${want_x11_xcb}" = "xno" ; then
1527 EVAS_CHECK_ENGINE([software-xlib], [${want_x11_xlib}], [no], [Software Xlib]) 1527 EVAS_CHECK_ENGINE([software-xlib], [${want_x11_xlib}], [no], [Software Xlib])
1528else 1528else
1529 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XLIB], [false]) 1529 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XLIB], [false])
1530 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [false]) 1530 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_XLIB], [false])
1531fi 1531fi
1532 1532
1533AC_MSG_CHECKING([whether to build Software Xlib Engine]) 1533AC_MSG_CHECKING([whether to build Software Xlib Engine])
@@ -2611,106 +2611,21 @@ fi
2611 2611
2612 2612
2613#### Ecore_X 2613#### Ecore_X
2614 2614if test "${want_x11_any}" = "yes"; then
2615AC_MSG_NOTICE([Ecore_X checks]) 2615AC_MSG_NOTICE([Ecore_X checks])
2616 2616
2617### Additional options to configure 2617### Additional options to configure
2618 2618
2619AC_ARG_ENABLE(ecore-x-composite, 2619AC_ARG_ENABLE([gesture],
2620 [AC_HELP_STRING([--disable-ecore-x-composite], 2620 [AC_HELP_STRING([--enable-gesture], [enable X11 Gestures and Input2.])],
2621 [disable the ecore_x support for Xcomposite extension. @<:@default=detect@:>@])], 2621 [
2622 [want_ecore_x_composite=$enableval], 2622 if test "x${enableval}" = "xyes" ; then
2623 [want_ecore_x_composite="yes"]) 2623 want_gesture="yes"
2624 2624 else
2625AC_ARG_ENABLE(ecore-x-cursor, 2625 want_gesture="no"
2626 [AC_HELP_STRING([--disable-ecore-x-cursor], 2626 fi
2627 [disable the ecore_x support for Xcursor library. @<:@default=detect@:>@])], 2627 ],
2628 [want_ecore_x_cursor=$enableval], 2628 [want_gesture="no"])
2629 [want_ecore_x_cursor="yes"])
2630
2631AC_ARG_ENABLE(ecore-x-damage,
2632 [AC_HELP_STRING([--disable-ecore-x-damage],
2633 [disable the ecore_x support for Xdamage extension. @<:@default=detect@:>@])],
2634 [want_ecore_x_damage=$enableval],
2635 [want_ecore_x_damage="yes"])
2636
2637AC_ARG_ENABLE(ecore-x-dpms,
2638 [AC_HELP_STRING([--disable-ecore-x-dpms],
2639 [disable the ecore_x support for Xdpms extension. @<:@default=detect@:>@])],
2640 [want_ecore_x_dpms=$enableval],
2641 [want_ecore_x_dpms="yes"])
2642
2643AC_ARG_ENABLE(ecore-x-dri,
2644 [AC_HELP_STRING([--disable-ecore-x-dri],
2645 [disable the ecore_x support for DRI extension. @<:@default=detect@:>@])],
2646 [want_ecore_x_dri=$enableval],
2647 [want_ecore_x_dri="yes"])
2648
2649AC_ARG_ENABLE(ecore-x-gesture,
2650 [AC_HELP_STRING([--enable-ecore-x-gesture],
2651 [enable the ecore_x support for Xgesture extension. @<:@default=detect@:>@])],
2652 [want_ecore_x_gesture=$enableval],
2653 [want_ecore_x_gesture="yes"])
2654
2655AC_ARG_ENABLE(ecore-x-input,
2656 [AC_HELP_STRING([--disable-ecore-x-input],
2657 [disable the ecore_x support for Xinput/Xinput2 extension. @<:@default=detect@:>@])],
2658 [want_ecore_x_input=$enableval],
2659 [want_ecore_x_input="yes"])
2660
2661AC_ARG_ENABLE(ecore-x-randr,
2662 [AC_HELP_STRING([--disable-ecore-x-randr],
2663 [disable the ecore_x support for Xrandr extension. @<:@default=detect@:>@])],
2664 [want_ecore_x_randr=$enableval],
2665 [want_ecore_x_randr="yes"])
2666
2667AC_ARG_ENABLE(ecore-x-render,
2668 [AC_HELP_STRING([--disable-ecore-x-render],
2669 [disable the ecore_x support for Xrender extension. @<:@default=detect@:>@])],
2670 [want_ecore_x_render=$enableval],
2671 [want_ecore_x_render="yes"])
2672
2673AC_ARG_ENABLE(ecore-x-screensaver,
2674 [AC_HELP_STRING([--disable-ecore-x-screensaver],
2675 [disable the ecore_x support for Xscreensaver extension. @<:@default=detect@:>@])],
2676 [want_ecore_x_screensaver=$enableval],
2677 [want_ecore_x_screensaver="yes"])
2678
2679AC_ARG_ENABLE(ecore-x-shape,
2680 [AC_HELP_STRING([--disable-ecore-x-shape],
2681 [disable the ecore_x support for Xshape extension. @<:@default=detect@:>@])],
2682 [want_ecore_x_shape=$enableval],
2683 [want_ecore_x_shape="yes"])
2684
2685AC_ARG_ENABLE(ecore-x-sync,
2686 [AC_HELP_STRING([--disable-ecore-x-sync],
2687 [disable the ecore_x support for Xsync extension. @<:@default=detect@:>@])],
2688 [want_ecore_x_sync=$enableval],
2689 [want_ecore_x_sync="yes"])
2690
2691AC_ARG_ENABLE(ecore-x-xfixes,
2692 [AC_HELP_STRING([--disable-ecore-x-xfixes],
2693 [disable the ecore_x support for Xfixes extension. @<:@default=detect@:>@])],
2694 [want_ecore_x_xfixes=$enableval],
2695 [want_ecore_x_xfixes="yes"])
2696
2697AC_ARG_ENABLE(ecore-x-xinerama,
2698 [AC_HELP_STRING([--disable-ecore-x-xinerama],
2699 [disable the ecore_x support for Xinerama extension. @<:@default=detect@:>@])],
2700 [want_ecore_x_xinerama=$enableval],
2701 [want_ecore_x_xinerama="yes"])
2702
2703AC_ARG_ENABLE(ecore-x-xprint,
2704 [AC_HELP_STRING([--disable-ecore-x-xprint],
2705 [disable the ecore_x support for Xprint extension. @<:@default=detect@:>@])],
2706 [want_ecore_x_xprint=$enableval],
2707 [want_ecore_x_xprint="yes"])
2708
2709AC_ARG_ENABLE(ecore-x-xtest,
2710 [AC_HELP_STRING([--disable-ecore-x-xtest],
2711 [disable the ecore_x support for Xtest extension. @<:@default=detect@:>@])],
2712 [want_ecore_x_xtest=$enableval],
2713 [want_ecore_x_xtest="yes"])
2714 2629
2715AC_ARG_ENABLE([xim], 2630AC_ARG_ENABLE([xim],
2716 [AC_HELP_STRING([--disable-xim], [disable X Input Method.])], 2631 [AC_HELP_STRING([--disable-xim], [disable X Input Method.])],
@@ -2725,8 +2640,6 @@ AC_ARG_ENABLE([xim],
2725 2640
2726### Default values 2641### Default values
2727 2642
2728use_Xcursor="no"
2729
2730### Checks for programs 2643### Checks for programs
2731 2644
2732### Checks for libraries 2645### Checks for libraries
@@ -2784,19 +2697,21 @@ int h = MAXHOSTNAMELEN;
2784fi 2697fi
2785 2698
2786## Xlib 2699## Xlib
2700use_Xcursor="no"
2787if test "x${want_x11_xlib}" = "xyes" ; then 2701if test "x${want_x11_xlib}" = "xyes" ; then
2788 if test "x$want_ecore_x_cursor" = "xyes"; then 2702 CFLAGS_save="${CFLAGS}"
2789 CFLAGS_save="${CFLAGS}" 2703 CFLAGS="$x_cflags $x_includes"
2790 CFLAGS="$x_cflags $x_includes" 2704 AC_CHECK_HEADER([X11/Xcursor/Xcursor.h],
2791 AC_CHECK_HEADER([X11/Xcursor/Xcursor.h], 2705 [use_Xcursor="yes"],
2792 [use_Xcursor="yes"], 2706 [use_Xcursor="no"],
2793 [use_Xcursor="no"], 2707 [#include <X11/Xlib.h>])
2794 [#include <X11/Xlib.h>]) 2708 CFLAGS="$CFLAGS_save"
2795 CFLAGS="$CFLAGS_save" 2709
2710 if test "${use_Xcursor}" = "no"; then
2711 AC_MSG_ERROR([Xcursor is missing])
2796 fi 2712 fi
2797fi 2713fi
2798 2714
2799## XCB
2800if test "x${want_x11_xcb}" = "xyes" ; then 2715if test "x${want_x11_xcb}" = "xyes" ; then
2801 KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 2716 KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
2802 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" 2717 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
@@ -2823,7 +2738,7 @@ fi
2823### Checks for library functions 2738### Checks for library functions
2824 2739
2825## Xlib 2740## Xlib
2826if test "x${want_x11_xlib}" = "xyes" && test "x$want_ecore_x_cursor" = "xyes" ; then 2741if test "x${want_x11_xlib}" = "xyes"; then
2827 AC_CHECK_LIB([Xcursor], 2742 AC_CHECK_LIB([Xcursor],
2828 [XcursorImageLoadCursor], 2743 [XcursorImageLoadCursor],
2829 [ 2744 [
@@ -2838,275 +2753,64 @@ if test "x${want_x11_xlib}" = "xyes" && test "x$want_ecore_x_cursor" = "xyes" ;
2838fi 2753fi
2839 2754
2840if test "x${want_x11_xlib}" = "xyes" ; then 2755if test "x${want_x11_xlib}" = "xyes" ; then
2841 ECORE_CHECK_X_EXTENSION([Xkb], [XKB.h], [X11], [XkbSetDetectableAutoRepeat], [$want_ecore_x_xkb]) 2756 ECORE_CHECK_X_EXTENSION([Xkb], [XKB.h], [X11], [XkbSetDetectableAutoRepeat])
2842 ECORE_CHECK_X_EXTENSION([Xcomposite], [Xcomposite.h], [Xcomposite], [XCompositeQueryExtension], [$want_ecore_x_composite]) 2757 ECORE_CHECK_X_EXTENSION([Xcomposite], [Xcomposite.h], [Xcomposite], [XCompositeQueryExtension])
2843 ECORE_CHECK_X_EXTENSION([Xdamage], [Xdamage.h], [Xdamage], [XDamageSubtract], [$want_ecore_x_damage]) 2758 ECORE_CHECK_X_EXTENSION([Xdamage], [Xdamage.h], [Xdamage], [XDamageSubtract])
2844 ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xdpms], [DPMSQueryExtension], [$want_ecore_x_dpms]) 2759 ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension])
2845 if test "x$use_xdpms" = "xno" ; then 2760 ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion])
2846 ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension], [$want_ecore_x_dpms]) 2761 ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens])
2762 ECORE_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens])
2763 ECORE_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRGetScreenResourcesCurrent])
2764 ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat])
2765 ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent])
2766 ECORE_CHECK_X_EXTENSION([Xss], [scrnsaver.h], [Xss], [XScreenSaverSelectInput])
2767
2768 if test "${want_gesture}" = "yes"; then
2769 ECORE_CHECK_X_EXTENSION([Xgesture], [gesture.h], [Xgesture], [XGestureQueryExtension])
2770 ECORE_CHECK_X_EXTENSION([Xi2], [XInput2.h], [Xi], [XIQueryDevice])
2771 ECORE_CHECK_X_EXTENSION([Xi2_2], [XInput2.h], [Xi], [XIGrabTouchBegin])
2847 fi 2772 fi
2848 ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion], [$want_ecore_x_xfixes]) 2773
2849 ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens], [$want_ecore_x_xinerama])
2850 ECORE_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens], [$want_ecore_x_xprint])
2851 ECORE_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRGetScreenResourcesCurrent], [$want_ecore_x_randr])
2852 ECORE_CHECK_X_EXTENSION([Xgesture], [gesture.h], [Xgesture], [XGestureQueryExtension], [$want_ecore_x_gesture])
2853 ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat], [$want_ecore_x_render])
2854 ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent], [$want_ecore_x_xtest])
2855 ECORE_CHECK_X_EXTENSION([Xss], [scrnsaver.h], [Xss], [XScreenSaverSelectInput], [$want_ecore_x_screensaver])
2856 ECORE_CHECK_X_EXTENSION([Xi2], [XInput2.h], [Xi], [XIQueryDevice], [$want_ecore_x_input])
2857 ECORE_CHECK_X_EXTENSION([Xi2_2], [XInput2.h], [Xi], [XIGrabTouchBegin], [$want_ecore_x_input])
2858
2859 AC_DEFINE([HAVE_ECORE_X_XLIB], [1], [Defined to 1 if Xlib is enabled.]) 2774 AC_DEFINE([HAVE_ECORE_X_XLIB], [1], [Defined to 1 if Xlib is enabled.])
2860fi 2775fi
2861 2776
2862## XCB 2777## XCB
2863 2778
2864if test "x${want_x11_xcb}" = "xyes" ; then 2779if test "${want_x11_xcb}" = "yes"; then
2865 PKG_CHECK_EXISTS([x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8], 2780dnl note: added pixman-1 as ecore_xcb_region uses that
2866 [ 2781 EFL_DEPEND_PKG([ecore_x], [ECORE_X_XCB],
2867 requirements_pc_ecore_x="${requirements_pc_ecore_x} x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8" 2782 [x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8 xcb-composite xcb-damage xcb-dpms xcb-randr xcb-render xcb-screensaver xcb-shape xcb-sync xcb-xfixes xcb-xinerama xcb-xprint xcb-xtest xcb-renderutil pixman-1])
2868 requirements_pc_deps_ecore_x="${requirements_pc_deps_ecore_x} x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8" 2783
2869 ], 2784dnl TODO: remove these ifdefs from code!
2870 [AC_MSG_ERROR([Ecore_X with XCB backend enabled but XCB not available. Exiting...])]) 2785 AC_DEFINE([ECORE_XCB_COMPOSITE], [1], [Build support for XCB composite])
2871 2786 AC_DEFINE([ECORE_XCB_DAMAGE], [1], [Build support for XCB damage])
2872 if test "x${have_pixman}" = "xyes" ; then 2787 AC_DEFINE([ECORE_XCB_DPMS], [1], [Build support for XCB dpms])
2873 requirements_pc_ecore_x="${requirements_pc_ecore_x} pixman-1" 2788 AC_DEFINE([ECORE_XCB_RANDR], [1], [Build support for XCB randr])
2874 requirements_pc_deps_ecore_x="${requirements_pc_deps_ecore_x} pixman-1" 2789 AC_DEFINE([ECORE_XCB_RENDER], [1], [Build support for XCB render])
2875 fi 2790 AC_DEFINE([ECORE_XCB_SCREENSAVER], [1], [Build support for XCB screensaver])
2876 2791 AC_DEFINE([ECORE_XCB_SHAPE], [1], [Build support for XCB shape])
2877 if test "x$want_ecore_x_composite" != "xno"; then 2792 AC_DEFINE([ECORE_XCB_SYNC], [1], [Build support for XCB sync])
2878 PKG_CHECK_EXISTS([xcb-composite], 2793 AC_DEFINE([ECORE_XCB_XFIXES], [1], [Build support for XCB xfixes])
2879 [ 2794 AC_DEFINE([ECORE_XCB_XINERAMA], [1], [Build support for XCB xinerama])
2880 have_ecore_x_xcb_composite="yes" 2795 AC_DEFINE([ECORE_XCB_XPRINT], [1], [Build support for XCB xprint])
2881 requirements_pc_ecore_x="xcb-composite ${requirements_pc_ecore_x}" 2796 AC_DEFINE([ECORE_XCB_XTEST], [1], [Build support for XCB xtest])
2882 requirements_pc_deps_ecore_x="xcb-composite ${requirements_pc_deps_ecore_x}" 2797 AC_DEFINE([ECORE_XCB_CURSOR], [1], [Build support for XCB cursor])
2883 AC_DEFINE([ECORE_XCB_COMPOSITE], [1], [Build support for XCB composite]) 2798
2884 ], 2799 EFL_OPTIONAL_DEPEND_PKG([ecore_x], [${want_gesture}], [ECORE_XCB_GESTURE],
2885 [have_ecore_x_xcb_composite="no"]) 2800 [xcb-gesture])
2886 else 2801 AC_DEFINE_IF([ECORE_XCB_XGESTURE], [test "${want_gesture}" = "yes"],
2887 have_ecore_x_xcb_composite="no" 2802 [1], [Build support for XCB xgesture])
2888 AC_MSG_NOTICE([composite extension explicitly disabled]) 2803
2889 fi 2804dnl input extension disabled currently in xcb as xcb-input has some issues
2890 2805dnl remember to add xcb-xinput to EFL_DEPEND_PKG()
2891 if test "x$want_ecore_x_damage" != "xno"; then 2806dnl AC_DEFINE([ECORE_XCB_XINPUT], [1], [Build support for XCB input])
2892 PKG_CHECK_EXISTS([xcb-damage], 2807
2893 [ 2808dnl dri extension disabled currently in xcb
2894 have_ecore_x_xcb_damage="yes" 2809dnl remember to add xcb-dri2 to EFL_DEPEND_PKG()
2895 requirements_pc_ecore_x="xcb-damage ${requirements_pc_ecore_x}" 2810dnl AC_DEFINE([ECORE_XCB_DRI], [1], [Build support for XCB dri])
2896 requirements_pc_deps_ecore_x="xcb-damage ${requirements_pc_deps_ecore_x}"
2897 AC_DEFINE([ECORE_XCB_DAMAGE], [1], [Build support for XCB damage])
2898 ],
2899 [have_ecore_x_xcb_damage="no"])
2900 else
2901 have_ecore_x_xcb_damage="no"
2902 AC_MSG_NOTICE([damage extension explicitly disabled])
2903 fi
2904
2905 if test "x$want_ecore_x_dpms" != "xno"; then
2906 PKG_CHECK_EXISTS([xcb-dpms],
2907 [
2908 have_ecore_x_xcb_dpms="yes"
2909 requirements_pc_ecore_x="xcb-dpms ${requirements_pc_ecore_x}"
2910 requirements_pc_deps_ecore_x="xcb-dpms ${requirements_pc_deps_ecore_x}"
2911 AC_DEFINE([ECORE_XCB_DPMS], [1], [Build support for XCB dpms])
2912 ],
2913 [have_ecore_x_xcb_dpms="no"])
2914 else
2915 have_ecore_x_xcb_dpms="no"
2916 AC_MSG_NOTICE([dpms extension explicitly disabled])
2917 fi
2918
2919 if test "x$want_ecore_x_randr" != "xno"; then
2920 PKG_CHECK_EXISTS([xcb-randr],
2921 [
2922 have_ecore_x_xcb_randr="yes"
2923 requirements_pc_ecore_x="xcb-randr ${requirements_pc_ecore_x}"
2924 requirements_pc_deps_ecore_x="xcb-randr ${requirements_pc_deps_ecore_x}"
2925 AC_DEFINE([ECORE_XCB_RANDR], [1], [Build support for XCB randr])
2926 ],
2927 [have_ecore_x_xcb_randr="no"])
2928 else
2929 have_ecore_x_xcb_randr="no"
2930 AC_MSG_NOTICE([randr extension explicitly disabled])
2931 fi
2932
2933 if test "x$want_ecore_x_render" != "xno"; then
2934 PKG_CHECK_EXISTS([xcb-render],
2935 [
2936 have_ecore_x_xcb_render="yes"
2937 requirements_pc_ecore_x="xcb-render ${requirements_pc_ecore_x}"
2938 requirements_pc_deps_ecore_x="xcb-render ${requirements_pc_deps_ecore_x}"
2939 AC_DEFINE([ECORE_XCB_RENDER], [1], [Build support for XCB render])
2940 ],
2941 [have_ecore_x_xcb_render="no"])
2942 else
2943 have_ecore_x_xcb_render="no"
2944 AC_MSG_NOTICE([render extension explicitly disabled])
2945 fi
2946
2947 if test "x$want_ecore_x_screensaver" != "xno"; then
2948 PKG_CHECK_EXISTS([xcb-screensaver],
2949 [
2950 have_ecore_x_xcb_screensaver="yes"
2951 requirements_pc_ecore_x="xcb-screensaver ${requirements_pc_ecore_x}"
2952 requirements_pc_deps_ecore_x="xcb-screensaver ${requirements_pc_deps_ecore_x}"
2953 AC_DEFINE([ECORE_XCB_SCREENSAVER], [1], [Build support for XCB screensaver])
2954 ],
2955 [have_ecore_x_xcb_screensaver="no"])
2956 else
2957 have_ecore_x_xcb_screensaver="no"
2958 AC_MSG_NOTICE([screensaver extension explicitly disabled])
2959 fi
2960
2961 if test "x$want_ecore_x_shape" != "xno"; then
2962 PKG_CHECK_EXISTS([xcb-shape],
2963 [
2964 have_ecore_x_xcb_shape="yes"
2965 requirements_pc_ecore_x="xcb-shape ${requirements_pc_ecore_x}"
2966 requirements_pc_deps_ecore_x="xcb-shape ${requirements_pc_deps_ecore_x}"
2967 AC_DEFINE([ECORE_XCB_SHAPE], [1], [Build support for XCB shape])
2968 ],
2969 [have_ecore_x_xcb_shape="no"])
2970 else
2971 have_ecore_x_xcb_shape="no"
2972 AC_MSG_NOTICE([shape extension explicitly disabled])
2973 fi
2974
2975 if test "x$want_ecore_x_gesture" != "xno"; then
2976 PKG_CHECK_EXISTS([xcb-gesture],
2977 [
2978 have_ecore_x_xcb_gesture="yes"
2979 requirements_pc_ecore_x="xcb-gesture ${requirements_pc_ecore_x}"
2980 requirements_pc_deps_ecore_x="xcb-gesture ${requirements_pc_deps_ecore_x}"
2981 AC_DEFINE([ECORE_XCB_XGESTURE], [1], [Build support for XCB xgesture])
2982 ],
2983 [have_ecore_x_xcb_gesture="no"])
2984 else
2985 have_ecore_x_xcb_gesture="no"
2986 AC_MSG_NOTICE([gesture extension explicitly disabled])
2987 fi
2988
2989 if test "x$want_ecore_x_sync" != "xno"; then
2990 PKG_CHECK_EXISTS([xcb-sync],
2991 [
2992 have_ecore_x_xcb_sync="yes"
2993 requirements_pc_ecore_x="xcb-sync ${requirements_pc_ecore_x}"
2994 requirements_pc_deps_ecore_x="xcb-sync ${requirements_pc_deps_ecore_x}"
2995 AC_DEFINE([ECORE_XCB_SYNC], [1], [Build support for XCB sync])
2996 ],
2997 [have_ecore_x_xcb_sync="no"])
2998 else
2999 have_ecore_x_xcb_sync="no"
3000 AC_MSG_NOTICE([sync extension explicitly disabled])
3001 fi
3002
3003 if test "x$want_ecore_x_xfixes" != "xno"; then
3004 PKG_CHECK_EXISTS([xcb-xfixes],
3005 [
3006 have_ecore_x_xcb_xfixes="yes"
3007 requirements_pc_ecore_x="xcb-xfixes ${requirements_pc_ecore_x}"
3008 requirements_pc_deps_ecore_x="xcb-xfixes ${requirements_pc_deps_ecore_x}"
3009 AC_DEFINE([ECORE_XCB_XFIXES], [1], [Build support for XCB xfixes])
3010 ],
3011 [have_ecore_x_xcb_xfixes="no"])
3012 else
3013 have_ecore_x_xcb_xfixes="no"
3014 AC_MSG_NOTICE([xfixes extension explicitly disabled])
3015 fi
3016
3017 if test "x$want_ecore_x_xinerama" != "xno"; then
3018 PKG_CHECK_EXISTS([xcb-xinerama],
3019 [
3020 have_ecore_x_xcb_xinerama="yes"
3021 requirements_pc_ecore_x="xcb-xinerama ${requirements_pc_ecore_x}"
3022 requirements_pc_deps_ecore_x="xcb-xinerama ${requirements_pc_deps_ecore_x}"
3023 AC_DEFINE([ECORE_XCB_XINERAMA], [1], [Build support for XCB xinerama])
3024 ],
3025 [have_ecore_x_xcb_xinerama="no"])
3026 else
3027 have_ecore_x_xcb_xinerama="no"
3028 AC_MSG_NOTICE([xinerama extension explicitly disabled])
3029 fi
3030
3031 if test "x$want_ecore_x_xprint" != "xno"; then
3032 PKG_CHECK_EXISTS([xcb-xprint],
3033 [
3034 have_ecore_x_xcb_xprint="yes"
3035 requirements_pc_ecore_x="xcb-xprint ${requirements_pc_ecore_x}"
3036 requirements_pc_deps_ecore_x="xcb-xprint ${requirements_pc_deps_ecore_x}"
3037 AC_DEFINE([ECORE_XCB_XPRINT], [1], [Build support for XCB xprint])
3038 ],
3039 [have_ecore_x_xcb_xprint="no"])
3040 else
3041 have_ecore_x_xcb_xprint="no"
3042 AC_MSG_NOTICE([xprint extension explicitly disabled])
3043 fi
3044
3045 if test "x$want_ecore_x_xtest" != "xno"; then
3046 PKG_CHECK_EXISTS([xcb-xtest],
3047 [
3048 have_ecore_x_xcb_xtest="yes"
3049 requirements_pc_ecore_x="xcb-xtest ${requirements_pc_ecore_x}"
3050 requirements_pc_deps_ecore_x="xcb-xtest ${requirements_pc_deps_ecore_x}"
3051 AC_DEFINE([ECORE_XCB_XTEST], [1], [Build support for XCB xtest])
3052 ],
3053 [have_ecore_x_xcb_xtest="no"])
3054 else
3055 have_ecore_x_xcb_xtest="no"
3056 AC_MSG_NOTICE([xtest extension explicitly disabled])
3057 fi
3058
3059# input extension disabled currently in xcb as xcb-input has some issues
3060 want_ecore_x_input="no"
3061 if test "x$want_ecore_x_input" != "xno"; then
3062 PKG_CHECK_EXISTS([xcb-xinput],
3063 [
3064 have_ecore_x_xcb_xinput="yes"
3065 requirements_pc_ecore_x="xcb-xinput ${requirements_pc_ecore_x}"
3066 requirements_pc_deps_ecore_x="xcb-xinput ${requirements_pc_deps_ecore_x}"
3067 AC_DEFINE([ECORE_XCB_XINPUT], [1], [Build support for XCB input])
3068 ],
3069 [have_ecore_x_xcb_xinput="no"])
3070 else
3071 have_ecore_x_xcb_xinput="no"
3072 AC_MSG_NOTICE([input extension explicitly disabled])
3073 fi
3074
3075 if test "x$want_ecore_x_cursor" != "xno"; then
3076 PKG_CHECK_EXISTS([xcb-render xcb-renderutil],
3077 [
3078 have_ecore_x_xcb_cursor="yes"
3079 requirements_pc_ecore_x="xcb-render xcb-renderutil ${requirements_pc_ecore_x}"
3080 requirements_pc_deps_ecore_x="xcb-render xcb-renderutil ${requirements_pc_deps_ecore_x}"
3081 AC_DEFINE([ECORE_XCB_CURSOR], [1], [Build support for XCB cursor])
3082 ],
3083 [have_ecore_x_xcb_cursor="no"])
3084 else
3085 have_ecore_x_xcb_cursor="no"
3086 AC_MSG_NOTICE([cursor extension explicitly disabled])
3087 fi
3088
3089# dri extension disabled currently in xcb
3090 want_ecore_x_dri="no"
3091 if test "x$want_ecore_x_dri" != "xno"; then
3092 PKG_CHECK_EXISTS([xcb-dri2],
3093 [
3094 have_ecore_x_xcb_dri="yes"
3095 requirements_pc_ecore_x="xcb-dri2 ${requirements_pc_ecore_x}"
3096 requirements_pc_deps_ecore_x="xcb-dri2 ${requirements_pc_deps_ecore_x}"
3097 AC_DEFINE([ECORE_XCB_DRI], [1], [Build support for XCB dri])
3098 ],
3099 [have_ecore_x_xcb_dri="no"])
3100 else
3101 have_ecore_x_xcb_dri="no"
3102 AC_MSG_NOTICE([dri extension explicitly disabled])
3103 fi
3104 2811
3105 PKG_CHECK_MODULES([ECORE_X], [${requirements_pc_deps_ecore_x}]) 2812 PKG_CHECK_MODULES([ECORE_X], [${requirements_pc_deps_ecore_x}])
3106 EFL_CHECK_FUNCS([ECORE_X], [dlopen iconv]) 2813 EFL_CHECK_FUNCS([ECORE_X], [dlopen iconv])
3107 AC_DEFINE([HAVE_ECORE_X_XCB], [1], [Defined to 1 if XCB is enabled.])
3108 have_ecore_x_xcb_define="-DHAVE_ECORE_X_XCB"
3109 AC_SUBST([have_ecore_x_xcb_define])
3110fi 2814fi
3111 2815
3112requirements_libs_ecore_x="${requirements_libs_ecore_x} ${ECORE_X_LIBS}" 2816requirements_libs_ecore_x="${requirements_libs_ecore_x} ${ECORE_X_LIBS}"
@@ -3114,6 +2818,7 @@ requirements_libs_ecore_x="${requirements_libs_ecore_x} ${ECORE_X_LIBS}"
3114AC_SUBST([ECORE_X_CFLAGS]) 2818AC_SUBST([ECORE_X_CFLAGS])
3115AC_SUBST([ECORE_X_LIBS]) 2819AC_SUBST([ECORE_X_LIBS])
3116 2820
2821fi
3117AM_CONDITIONAL([HAVE_ECORE_X_XLIB], [test "${want_x11_xlib}" = "yes"]) 2822AM_CONDITIONAL([HAVE_ECORE_X_XLIB], [test "${want_x11_xlib}" = "yes"])
3118AM_CONDITIONAL([HAVE_ECORE_X_XCB], [test "${want_x11_xcb}" = "yes"]) 2823AM_CONDITIONAL([HAVE_ECORE_X_XCB], [test "${want_x11_xcb}" = "yes"])
3119AM_CONDITIONAL([HAVE_ECORE_X], [test "${want_x11_any}" = "yes"]) 2824AM_CONDITIONAL([HAVE_ECORE_X], [test "${want_x11_any}" = "yes"])
@@ -3278,7 +2983,6 @@ ECORE_EVAS_MODULE([ews], [yes])
3278ECORE_EVAS_MODULE([fb], [${want_fb}]) 2983ECORE_EVAS_MODULE([fb], [${want_fb}])
3279ECORE_EVAS_MODULE([psl1ght], [${have_ps3}]) 2984ECORE_EVAS_MODULE([psl1ght], [${have_ps3}])
3280 2985
3281# XXX TODO:
3282ECORE_EVAS_MODULE([opengl-cocoa], [${want_ecore_evas_gl_cocoa}]) 2986ECORE_EVAS_MODULE([opengl-cocoa], [${want_ecore_evas_gl_cocoa}])
3283 2987
3284ECORE_EVAS_MODULE([software-sdl], [${want_sdl}]) 2988ECORE_EVAS_MODULE([software-sdl], [${want_sdl}])
@@ -3362,11 +3066,7 @@ fi
3362 3066
3363# XXX TODO: ecore_evas_opengl_x11 3067# XXX TODO: ecore_evas_opengl_x11
3364 3068
3365ECORE_EVAS_CHECK_MODULE_FULL([opengl-x11], 3069ECORE_EVAS_MODULE([opengl-x11], [${want_x11_any_opengl}])
3366 [${have_evas_engine_gl_x11}],
3367 [${want_x11_any_opengl}],
3368 [OpenGL Xlib],
3369 [${want_x11_any}])
3370 3070
3371have_ecore_evas_opengl_xlib="no" 3071have_ecore_evas_opengl_xlib="no"
3372have_ecore_evas_opengl_xcb="no" 3072have_ecore_evas_opengl_xcb="no"
@@ -3680,8 +3380,8 @@ echo
3680echo "Evas:" 3380echo "Evas:"
3681echo 3381echo
3682echo " Engines:" 3382echo " Engines:"
3683echo " Software X11...............: $have_evas_engine_software_x11 (Xlib: $have_evas_engine_software_xlib) (XCB: $have_evas_engine_software_xcb)" 3383echo " Software X11...............: ${with_x11}"
3684echo " OpenGL X11.................: $have_evas_engine_gl_x11 (Xlib: $have_evas_engine_gl_xlib) (XCB: $have_evas_engine_gl_xcb) (x11=${with_opengl})" 3384echo " OpenGL X11.................: ${with_x11} (opengl=${with_opengl})"
3685echo " Software GDI...............: $have_evas_engine_software_gdi" 3385echo " Software GDI...............: $have_evas_engine_software_gdi"
3686echo " Software DirectDraw........: $have_evas_engine_software_ddraw" 3386echo " Software DirectDraw........: $have_evas_engine_software_ddraw"
3687echo " OpenGL SDL.................: $have_evas_engine_gl_sdl (opengl=${with_opengl})" 3387echo " OpenGL SDL.................: $have_evas_engine_gl_sdl (opengl=${with_opengl})"
@@ -3761,62 +3461,19 @@ echo
3761echo "Ecore Graphic systems:" 3461echo "Ecore Graphic systems:"
3762echo 3462echo
3763 3463
3764echo " Ecore_X......................: ${with_x11}" 3464echo " Ecore_X....................: ${with_x11} (pixman=${want_pixman}) (gesture=${want_gesture})"
3765if test "${want_x11_xcb}" = "yes" ; then
3766 echo " Xprint.....................: $have_ecore_x_xcb_xprint"
3767 echo " Xinerama...................: $have_ecore_x_xcb_xinerama"
3768 echo " Xrandr.....................: $have_ecore_x_xcb_randr"
3769 echo " Xscreensaver...............: $have_ecore_x_xcb_screensaver"
3770 echo " Xshape.....................: $have_ecore_x_xcb_shape"
3771 echo " Xgesture...................: $have_ecore_x_xcb_gesture"
3772 echo " Xsync......................: $have_ecore_x_xcb_sync"
3773 echo " Xrender....................: $have_ecore_x_xcb_render"
3774 echo " Xcomposite.................: $have_ecore_x_xcb_composite"
3775 echo " Xfixes.....................: $have_ecore_x_xcb_xfixes"
3776 echo " Xdamage....................: $have_ecore_x_xcb_damage"
3777 echo " Xdpms......................: $have_ecore_x_xcb_dpms"
3778 echo " Xtest......................: $have_ecore_x_xcb_xtest"
3779elif test "${want_x11_xlib}" = "yes" ; then
3780 echo " Xcursor....................: $use_Xcursor"
3781 echo " Xkb........................: $use_xkb"
3782 echo " Xprint.....................: $use_xprint"
3783 echo " Xinerama...................: $use_xinerama"
3784 echo " Xrandr.....................: $use_xrandr"
3785 echo " Xgesture...................: $use_xgesture"
3786 echo " Xscreensaver...............: $use_xss"
3787 echo " Xrender....................: $use_xrender"
3788 echo " Xcomposite.................: $use_xcomposite"
3789 echo " Xfixes.....................: $use_xfixes"
3790 echo " Xdamage....................: $use_xdamage"
3791 echo " Xdpms......................: $use_xdpms"
3792 echo " Xtest......................: $use_xtest"
3793 echo " XIM........................: $want_xim"
3794 echo " Xi2........................: $use_xi2"
3795 echo " Xi2.2......................: $use_xi2_2"
3796fi
3797echo " Ecore_Win32................: $have_win32" 3465echo " Ecore_Win32................: $have_win32"
3798echo " Ecore_Cocoa................: $have_ecore_cocoa" 3466echo " Ecore_Cocoa................: $have_ecore_cocoa"
3799echo " Ecore_SDL..................: $want_sdl" 3467echo " Ecore_SDL..................: $want_sdl"
3800echo " Ecore_FB...................: $want_fb" 3468echo " Ecore_FB...................: $want_fb (tslib=${have_tslib})"
3801if test "x${wantfb}" = "xyes" ; then
3802 echo " Touchscreen..............: $have_tslib"
3803fi
3804echo " Ecore_WinCE................: $have_wince" 3469echo " Ecore_WinCE................: $have_wince"
3805echo " Ecore_PSL1GHT..............: $have_ps3" 3470echo " Ecore_PSL1GHT..............: $have_ps3"
3806echo " Ecore_Wayland..............: $want_wayland" 3471echo " Ecore_Wayland..............: $want_wayland"
3807 3472
3808echo " Ecore_Evas...................: $have_ecore_evas" 3473echo " Ecore_Evas...................: $have_ecore_evas"
3809#if test "x${have_ecore_evas}" = "xyes" ; then 3474#if test "x${have_ecore_evas}" = "xyes" ; then
3810 if test "x${have_ecore_evas_software_x11}" = "xyes" ; then 3475 echo " Software X11...............: ${with_x11}"
3811 echo " Software X11...............: $have_ecore_evas_software_x11 (Xlib: ${have_ecore_evas_software_xlib}) (XCB: ${have_ecore_evas_software_xcb})" 3476 echo " OpenGL X11.................: ${with_x11} (opengl=${with_opengl})"
3812 else
3813 echo " Software X11...............: $have_ecore_evas_software_x11"
3814 fi
3815 if test "x${have_ecore_evas_opengl_x11}" = "xyes" ; then
3816 echo " OpenGL X11.................: $have_ecore_evas_opengl_x11 (Xlib: ${have_ecore_evas_opengl_xlib}) (XCB: ${have_ecore_evas_opengl_xcb})"
3817 else
3818 echo " OpenGL X11.................: $have_ecore_evas_opengl_x11"
3819 fi
3820 echo " Software GDI...............: $have_ecore_evas_software_gdi" 3477 echo " Software GDI...............: $have_ecore_evas_software_gdi"
3821 echo " Software DirectDraw........: $have_ecore_evas_software_ddraw" 3478 echo " Software DirectDraw........: $have_ecore_evas_software_ddraw"
3822 echo " Software SDL...............: $have_ecore_evas_software_sdl" 3479 echo " Software SDL...............: $have_ecore_evas_software_sdl"
diff --git a/m4/ecore_check_c_extension.m4 b/m4/ecore_check_c_extension.m4
index 1ef3bd2f91..9918a4b9a2 100644
--- a/m4/ecore_check_c_extension.m4
+++ b/m4/ecore_check_c_extension.m4
@@ -1,42 +1,23 @@
1dnl use: ECORE_CHECK_X_EXTENSION(Foo, header, lib, func, want) 1dnl use: ECORE_CHECK_X_EXTENSION(Foo, header, lib, func)
2AC_DEFUN([ECORE_CHECK_X_EXTENSION], 2AC_DEFUN([ECORE_CHECK_X_EXTENSION],
3[ 3[
4pushdef([UP], translit([$1], [a-z], [A-Z]))dnl 4pushdef([UP], translit([$1], [a-z], [A-Z]))dnl
5pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl
6 5
7UP[]_CFLAGS=""
8UP[]_LIBS=""
9use_[]DOWN="no"
10
11if test "x$5" != "xno"; then
12 SAVE_CFLAGS=$CFLAGS 6 SAVE_CFLAGS=$CFLAGS
13 CFLAGS="$x_cflags $x_includes" 7 CFLAGS="$x_cflags $x_includes"
14 AC_CHECK_HEADER(X11/extensions/$2, 8 AC_CHECK_HEADER(X11/extensions/$2,
15 [ 9 [
16 AC_CHECK_LIB($3, $4, 10 AC_CHECK_LIB($3, $4,
17 [ 11 [AC_DEFINE(ECORE_[]UP, 1, [Build support for $1])],
18 AC_DEFINE(ECORE_[]UP, 1, [Build support for $1]) 12 [AC_MSG_ERROR([Missing support for X extension: $1])],
19 UP[]_LIBS="-l$3" 13 [$x_libs])
20 use_[]DOWN="yes"
21 ],
22 [use_[]DOWN="no"],
23 [$x_libs]
24 )
25 ], 14 ],
26 [ use_[]DOWN="no" ], 15 [AC_MSG_ERROR([Missing X11/extensions/$2])],
27 [ #include <X11/Xlib.h> ] 16 [ #include <X11/Xlib.h> ]
28 ) 17 )
29 CFLAGS=$SAVE_CFLAGS 18 CFLAGS=$SAVE_CFLAGS
30else
31 use_[]DOWN="no"
32 AC_MSG_NOTICE([$1 support disabled])
33fi
34
35ECORE_X_LIBS="${ECORE_X_LIBS} ${UP[]_LIBS}"
36 19
37AC_SUBST(UP[]_CFLAGS) 20ECORE_X_LIBS="${ECORE_X_LIBS} -l$3"
38AC_SUBST(UP[]_LIBS)
39 21
40popdef([UP]) 22popdef([UP])
41popdef([DOWN])
42]) 23])
diff --git a/m4/ecore_check_module.m4 b/m4/ecore_check_module.m4
index 554992d1b7..2aa38c3589 100644
--- a/m4/ecore_check_module.m4
+++ b/m4/ecore_check_module.m4
@@ -71,51 +71,3 @@ AM_CONDITIONAL([BUILD_ECORE_EVAS_]UP, [test "x$have_ecore_evas_]m4_defn([DOWN])[
71m4_popdef([UP]) 71m4_popdef([UP])
72m4_popdef([DOWN]) 72m4_popdef([DOWN])
73]) 73])
74
75dnl use: ECORE_EVAS_CHECK_MODULE_FULL(foo-bar, evas-module, want, description, backend[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
76AC_DEFUN([ECORE_EVAS_CHECK_MODULE_FULL],
77[
78m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl
79m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl
80
81have_ecore_evas_[]m4_defn([DOWN])="no"
82want_module="$3"
83
84AC_ARG_ENABLE(ecore-evas-$1,
85 [AC_HELP_STRING(
86 [--enable-ecore-evas-$1],
87 [enable $4 support in the ecore_evas module.])],
88 [
89 if test "x${enableval}" = "xyes" ; then
90 want_module="yes"
91 else
92 want_module="no"
93 fi
94 ],
95 [])
96
97AC_MSG_CHECKING([whether ecore_evas $4 support is to be built])
98AC_MSG_RESULT([${want_module}])
99
100if test "x$2" = "xyes" && \
101 test "x$5" = "xyes" && \
102 test "x$have_ecore_evas" = "xyes" && \
103 test "x$want_module" = "xyes" ; then
104 AC_DEFINE([BUILD_ECORE_EVAS_]m4_defn([UP]), [1], [Support for $4 Engine in Ecore_Evas])
105 have_ecore_evas_[]m4_defn([DOWN])="yes"
106fi
107
108AC_MSG_CHECKING([whether ecore_evas $4 support is built])
109AC_MSG_RESULT([$have_ecore_evas_]m4_defn([DOWN]))
110
111AM_CONDITIONAL([BUILD_ECORE_EVAS_]UP, [test "x$have_ecore_evas_]m4_defn([DOWN])[" = "xyes"])
112
113AS_IF([test "x$have_ecore_evas_[]m4_defn([DOWN])" = "xyes"], [$6], [$7])
114
115m4_popdef([UP])
116m4_popdef([DOWN])
117])
118
119dnl use: ECORE_EVAS_CHECK_MODULE(foo-bar, want, description, backend[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
120AC_DEFUN([ECORE_EVAS_CHECK_MODULE],
121[ECORE_EVAS_CHECK_MODULE_FULL([$1], [$1], [$2], [$3], [$4], [$5], [$6])])
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index 35e8c19683..2b54f7d294 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -670,24 +670,10 @@ want_static_engine="no"
670have_engine="no" 670have_engine="no"
671have_evas_engine_[]DOWN="no" 671have_evas_engine_[]DOWN="no"
672 672
673AC_ARG_ENABLE([$1],
674 [AC_HELP_STRING([--enable-$1], [enable $4 rendering backend])],
675 [
676 if test "x${enableval}" = "xyes" ; then
677 want_engine="yes"
678 else
679 if test "x${enableval}" = "xstatic" ; then
680 want_engine="static"
681 else
682 want_engine="no"
683 fi
684 fi
685 ])
686
687AC_MSG_CHECKING([whether to enable $4 rendering backend]) 673AC_MSG_CHECKING([whether to enable $4 rendering backend])
688AC_MSG_RESULT([${want_engine}]) 674AC_MSG_RESULT([${want_engine}])
689 675
690if test "x${want_engine}" = "xyes" -o "x${want_engine}" = "xstatic" -o "x${want_engine}" = "xauto" ; then 676if test "x${want_engine}" = "xyes" -o "x${want_engine}" = "xstatic"; then
691 m4_default([EVAS_CHECK_ENGINE_DEP_]m4_defn([UP]))(DOWN, $3, ${want_engine}, [have_engine="yes"], [have_engine="no"]) 677 m4_default([EVAS_CHECK_ENGINE_DEP_]m4_defn([UP]))(DOWN, $3, ${want_engine}, [have_engine="yes"], [have_engine="no"])
692fi 678fi
693 679