diff options
| author | Guilherme Iscaro <iscaro@profusion.mobi> | 2016-10-28 09:56:42 -0700 |
|---|---|---|
| committer | Cedric Bail <cedric@osg.samsung.com> | 2016-10-28 09:56:47 -0700 |
| commit | 4bffa7bfa79c2a1b5f1f5eb2d80e8667d1b49b67 (patch) | |
| tree | 0546606779979622cc8a9f1d917f9e8943bb7f98 /configure.ac | |
| parent | 53f406a0a3db2184f8c10b5c133186fe88f23ef8 (diff) | |
| download | efl-4bffa7bfa79c2a1b5f1f5eb2d80e8667d1b49b67.tar.gz | |
ecore_evas: refactor VNC as an Eina Module.
Summary:
This change removes the necessity to link EFL against the libvncserver
Please ignore the first three commits, they're being reviewed here:
https://phab.enlightenment.org/D4323
Reviewers: bdilly, cedric
Reviewed By: cedric
Subscribers: cedric, jpeg
Differential Revision: https://phab.enlightenment.org/D4338
Signed-off-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 4e61cc5d40..4f68b1eeb3 100644 --- a/configure.ac +++ b/configure.ac @@ -436,9 +436,10 @@ AC_SUBST([ENABLE_LIBLZ4]) want_vnc_server="no" AC_ARG_ENABLE([vnc-server], - [AS_HELP_STRING([--enable-vnc-server],[Enable VNC server support for Ecore_Evas_X. @<:@default=disabled@:>@])], + [AS_HELP_STRING([--enable-vnc-server],[Build Ecore_Evas VNC module. @<:@default=disabled@:>@])], [ if test "x${enableval}" = "xyes" ; then + PKG_CHECK_MODULES([LIBVNCSERVER], [libvncserver]) want_vnc_server="yes" else want_vnc_server="no" @@ -446,11 +447,6 @@ AC_ARG_ENABLE([vnc-server], ], [want_vnc_server="no"]) -AM_CONDITIONAL([ENABLE_VNC_SERVER], [test "${want_vnc_server}" = "yes"]) -AC_DEFINE_IF([ENABLE_VNC_SERVER], [test "${want_vnc_server}" = "yes"], [1], [Use VNC server support for Ecore_Evas_X]) -AC_SUBST([want_vnc_server]) -AC_SUBST([ENABLE_VNC_SERVER]) - #### Checks for header files # Common Checks (keep names sorted for ease of use): @@ -4649,10 +4645,7 @@ AM_CONDITIONAL([BUILD_ECORE_EVAS_WIN32], # XXX TODO: ecore_evas_x11 - -ECORE_EVAS_MODULE([software-x11], [${want_x11_any}], - [EFL_OPTIONAL_DEPEND_PKG([ECORE_EVAS], [${want_vnc_server}], [VNC_SERVER], [libvncserver])]) -EFL_ADD_FEATURE([ECORE_EVAS], [vnc_server]) +ECORE_EVAS_MODULE([software-x11], [${want_x11_any}]) have_ecore_evas_software_xlib="no" have_ecore_evas_software_xcb="no" @@ -4675,8 +4668,7 @@ fi # XXX TODO: ecore_evas_opengl_x11 -ECORE_EVAS_MODULE([opengl-x11], [${want_x11_any_opengl}], - [EFL_OPTIONAL_DEPEND_PKG([ECORE_EVAS], [${want_vnc_server}], [VNC_SERVER], [libvncserver])]) +ECORE_EVAS_MODULE([opengl-x11], [${want_x11_any_opengl}]) have_ecore_evas_opengl_xlib="no" have_ecore_evas_opengl_xcb="no" @@ -4708,14 +4700,22 @@ if test "x${have_ecore_evas_opengl_x11}" = "xyes" || test "x${have_ecore_evas_op fi build_ecore_evas_x11="no" +build_ecore_evas_vnc="no" if test "x$have_ecore_evas_software_x11" = "xyes" || \ test "x$have_ecore_evas_opengl_x11" = "xyes" || \ test "x$have_ecore_evas_software_xcb" = "xyes"; then AC_DEFINE([BUILD_ECORE_EVAS_X11], [1], [Support for X Window Engines in Ecore_Evas]) build_ecore_evas_x11="yes" + if test "$want_vnc_server" = "yes"; then + build_ecore_evas_vnc="yes" + fi fi AM_CONDITIONAL([BUILD_ECORE_EVAS_X11], [test "${build_ecore_evas_x11}" = "yes"]) +AM_CONDITIONAL([BUILD_ECORE_EVAS_VNC_SERVER], [test "${build_ecore_evas_vnc}" = "yes"]) +AC_DEFINE_IF([BUILD_ECORE_EVAS_VNC_SERVER], [test "${build_ecore_evas_vnc}" = "yes"], [1], [Build Ecore_Evas VNC module]) +EFL_ADD_FEATURE([ECORE_EVAS], [vnc_server], [${build_ecore_evas_vnc}]) + EFL_EVAL_PKGS([ECORE_EVAS]) ### Checks for header files |