Revert "Add --disable-gui."

This reverts commit 3ed4f74590.
This commit is contained in:
Cedric BAIL 2015-03-17 08:49:54 +01:00
parent d7d9317da4
commit cf52036667
4 changed files with 43 additions and 195 deletions

View File

@ -611,18 +611,6 @@ AC_DEFINE_IF([HAVE_ATFILE_SOURCE],
###################### EFL ######################
build_gui="yes"
AC_ARG_ENABLE([gui],
[AS_HELP_STRING([--disable-gui],[disable GUI libraries @<:@default=enable@:>@])],
[
if test "x${enableval}" = "xyes"; then
build_gui="yes"
CFOPT_WARNING="yes"
else
build_gui="no"
fi
])
AM_CONDITIONAL([BUILD_GUI], [test "x${build_gui}" = "xyes"])
AC_ARG_ENABLE([systemd],
[AS_HELP_STRING([--enable-systemd],[Enable systemd support. @<:@default=disabled@:>@])],
@ -1177,7 +1165,8 @@ EFL_LIB_END([Efl])
#### End of Efl
#### Evas
EFL_LIB_START_OPTIONAL([Evas], [test "x${build_gui}" = "xyes"])
EFL_LIB_START([Evas])
### Additional options to configure
@ -2050,81 +2039,7 @@ EFL_ADD_FEATURE([EVAS], [cserve], [${want_evas_cserve2}])
EFL_ADD_FEATURE([EVAS], [tile-rotate])
EFL_ADD_FEATURE([EVAS], [dither-mask], [${build_evas_dither_mask}])
EFL_LIB_END_OPTIONAL([Evas])
if test "x${build_gui}" = "xno"; then
AM_CONDITIONAL([BUILD_ENGINE_BUFFER], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_BUFFER], [false])
AM_CONDITIONAL([BUILD_ENGINE_FB], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_FB], [false])
AM_CONDITIONAL([BUILD_ENGINE_PSL1GHT], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_PSL1GHT], [false])
AM_CONDITIONAL([BUILD_ENGINE_GL_COCOA], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COCOA], [false])
AM_CONDITIONAL([BUILD_ENGINE_GL_SDL], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_SDL], [false])
AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_GDI], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_GDI], [false])
AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_DDRAW], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_DDRAW], [false])
AM_CONDITIONAL([BUILD_ENGINE_WAYLAND_EGL], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_WAYLAND_EGL], [false])
AM_CONDITIONAL([BUILD_ENGINE_WAYLAND_SHM], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_WAYLAND_SHM], [false])
AM_CONDITIONAL([BUILD_ENGINE_DRM], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_DRM], [false])
AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XCB], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_XCB], [false])
AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XLIB], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_XLIB], [false])
AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_X11], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_GENERIC], [false])
AM_CONDITIONAL([BUILD_ENGINE_GL_XCB], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_XCB], [false])
AM_CONDITIONAL([BUILD_ENGINE_GL_XLIB], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_XLIB], [false])
AM_CONDITIONAL([BUILD_ENGINE_GL_X11], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_X11], [false])
AM_CONDITIONAL([BUILD_ENGINE_GL_COMMON], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COMMON], [false])
AM_CONDITIONAL([BUILD_LOADER_BMP], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_BMP], [false])
AM_CONDITIONAL([BUILD_LOADER_EET], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_EET], [false])
AM_CONDITIONAL([BUILD_LOADER_GENERIC], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_GENERIC], [false])
AM_CONDITIONAL([BUILD_LOADER_GIF], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_GIF], [false])
AM_CONDITIONAL([BUILD_LOADER_ICO], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_ICO], [false])
AM_CONDITIONAL([BUILD_LOADER_JPEG], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_JPEG], [false])
AM_CONDITIONAL([BUILD_LOADER_JP2K], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_JP2K], [false])
AM_CONDITIONAL([BUILD_LOADER_PMAPS], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_PMAPS], [false])
AM_CONDITIONAL([BUILD_LOADER_PNG], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_PNG], [false])
AM_CONDITIONAL([BUILD_LOADER_PSD], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_PSD], [false])
AM_CONDITIONAL([BUILD_LOADER_TGA], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_TGA], [false])
AM_CONDITIONAL([BUILD_LOADER_TIFF], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_TIFF], [false])
AM_CONDITIONAL([BUILD_LOADER_WBMP], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_WBMP], [false])
AM_CONDITIONAL([BUILD_LOADER_WEBP], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_WEBP], [false])
AM_CONDITIONAL([BUILD_LOADER_XPM], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_XPM], [false])
AM_CONDITIONAL([BUILD_LOADER_TGV], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_TGV], [false])
AM_CONDITIONAL([BUILD_LOADER_DDS], [false])
AM_CONDITIONAL([EVAS_STATIC_BUILD_DDS], [false])
AM_CONDITIONAL([EVAS_CSERVE2], [false])
fi
EFL_LIB_END([Evas])
#### End of Evas
#### Edje CXX
@ -2235,9 +2150,6 @@ AC_ARG_ENABLE([gstreamer1],
fi
],
[want_gstreamer1="yes"])
if test "x${build_gui}" = "xno"; then
want_gstreamer1="no"
fi
AC_ARG_ENABLE([tizen],
[AS_HELP_STRING([--enable-tizen],[enable tizen support. @<:@default=disabled@:>@])],
@ -2654,7 +2566,7 @@ EFL_LIB_END([Ecore_File])
#### Ecore_Input
EFL_LIB_START_OPTIONAL([Ecore_Input], [test "x${build_gui}" = "xyes"])
EFL_LIB_START([Ecore_Input])
### Additional options to configure
@ -2682,12 +2594,12 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eina])
### Checks for library functions
EFL_LIB_END_OPTIONAL([Ecore_Input])
EFL_LIB_END([Ecore_Input])
#### End of Ecore_Input
#### Ecore_Input_Evas
EFL_LIB_START_OPTIONAL([Ecore_Input_Evas], [test "x${build_gui}" = "xyes"])
EFL_LIB_START([Ecore_Input_Evas])
### Additional options to configure
@ -2718,7 +2630,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina])
### Checks for library functions
EFL_LIB_END_OPTIONAL([Ecore_Input_Evas])
EFL_LIB_END([Ecore_Input_Evas])
#### End of Ecore_Input_Evas
@ -3152,10 +3064,6 @@ AC_ARG_ENABLE([audio],
],
[want_audio="yes"])
if test "x${build_gui}" = "xno"; then
want_audio="no"
fi
EFL_LIB_START_OPTIONAL([Ecore_Audio], [test "${want_audio}" = "yes"])
### Additional options to configure
@ -3609,7 +3517,7 @@ AM_CONDITIONAL([HAVE_ECORE_X_XCB], [test "${want_x11_xcb}" = "yes"])
#### Ecore_Imf
EFL_LIB_START_OPTIONAL([Ecore_Imf], [test "x${build_gui}" = "xyes"])
EFL_LIB_START([Ecore_Imf])
### Additional options to configure
@ -3725,18 +3633,12 @@ EFL_ADD_FEATURE([ECORE_IMF], [wayland], [${want_ecore_imf_wayland}])
### Checks for library functions
EFL_LIB_END_OPTIONAL([Ecore_Imf])
if test "x${build_gui}" = "xno"; then
AM_CONDITIONAL([BUILD_ECORE_IMF_IBUS], [false])
AM_CONDITIONAL([BUILD_ECORE_IMF_SCIM], [false])
AM_CONDITIONAL([BUILD_ECORE_IMF_XIM], [false])
AM_CONDITIONAL([BUILD_ECORE_IMF_WAYLAND], [false])
fi
EFL_LIB_END([Ecore_Imf])
#### End of Ecore_Imf
#### Ecore_Imf_Evas
EFL_LIB_START_OPTIONAL([Ecore_Imf_Evas], [test "x${build_gui}" = "xyes"])
EFL_LIB_START([Ecore_Imf_Evas])
### Additional options to configure
@ -3768,12 +3670,12 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina])
### Checks for library functions
EFL_LIB_END_OPTIONAL([Ecore_Imf_Evas])
EFL_LIB_END([Ecore_Imf_Evas])
#### End of Ecore_Imf_Evas
#### Ecore_Evas
EFL_LIB_START_OPTIONAL([Ecore_Evas], [test "x${build_gui}" = "xyes"])
EFL_LIB_START([Ecore_Evas])
### Additional options to configure
@ -3935,28 +3837,7 @@ EFL_EVAL_PKGS([ECORE_EVAS])
### Checks for library functions
EFL_LIB_END_OPTIONAL([Ecore_Evas])
if test "x${build_gui}" = "xno"; then
AM_CONDITIONAL([BUILD_ECORE_EVAS_EXTN], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_EWS], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_FB], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_DRM], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_PSL1GHT], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_OPENGL_COCOA], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_SOFTWARE_SDL], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_OPENGL_SDL], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_SDL], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_WAYLAND_SHM], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_WAYLAND_EGL], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_WAYLAND], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_SOFTWARE_GDI], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_SOFTWARE_DDRAW], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_WIN32], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_SOFTWARE_X11], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_OPENGL_X11], [false])
AM_CONDITIONAL([BUILD_ECORE_EVAS_X11], [false])
fi
EFL_LIB_END([Ecore_Evas])
#### End of Ecore_Evas
#### Eio
@ -4067,10 +3948,6 @@ AC_ARG_ENABLE([physics],
],
[want_physics="yes"])
if test "x${build_gui}" = "xno"; then
want_physics="no"
fi
EFL_LIB_START_OPTIONAL([EPhysics], [test "${want_physics}" = "yes"])
### Additional options to configure
@ -4109,7 +3986,7 @@ EFL_LIB_END_OPTIONAL([EPhysics])
#### Edje
EFL_LIB_START_OPTIONAL([Edje], [test "x${build_gui}" = "xyes"])
EFL_LIB_START([Edje])
### Additional options to configure
@ -4127,10 +4004,6 @@ AC_ARG_ENABLE([multisense],
],
[want_multisense="${want_pulseaudio}"])
if test "x${build_gui}" = "xno"; then
want_multisense="no"
fi
# TODO: should we keep or remove these?
want_edje_program_cache="no"
want_edje_calc_cache="yes"
@ -4181,8 +4054,7 @@ AC_DEFINE_IF([BUILD_EDJE_FP], [test "${want_fixed_point}" = "yes"],
AM_CONDITIONAL([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"])
AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"],
[1], [Use Multisense])
[1], [Use Multisense])
AC_SUBST([want_multisense])
AC_SUBST([want_physics])
@ -4202,15 +4074,9 @@ sys/wait.h \
### Checks for library functions
EFL_LIB_END_OPTIONAL([Edje])
if test "x${build_gui}" = "xno"; then
AC_DEFINE([ENABLE_MULTISENSE], [0], [Use Multisense])
AM_CONDITIONAL([ENABLE_MULTISENSE], [false])
fi
EFL_LIB_END([Edje])
#### End of Edje
#### Edje CXX
EFL_LIB_START([Edje_Cxx])
@ -4220,7 +4086,7 @@ EFL_LIB_END([Edje_Cxx])
#### End of Edje CXX
#### Emotion
EFL_LIB_START_OPTIONAL([Emotion], [test "x${build_gui}" = "xyes"])
EFL_LIB_START([Emotion])
## Compatibility layers
EFL_PLATFORM_DEPEND([Emotion], [evil])
@ -4306,23 +4172,12 @@ fi
### Check availability
EFL_LIB_END_OPTIONAL([Emotion])
if test "x${build_gui}" = "xno"; then
AM_CONDITIONAL([EMOTION_BUILD_XINE], [false])
AM_CONDITIONAL([EMOTION_STATIC_BUILD_XINE], [false])
AM_CONDITIONAL([EMOTION_BUILD_GSTREAMER], [false])
AM_CONDITIONAL([EMOTION_STATIC_BUILD_GSTREAMER], [false])
AM_CONDITIONAL([EMOTION_BUILD_GSTREAMER1], [false])
AM_CONDITIONAL([EMOTION_STATIC_BUILD_GSTREAMER1], [false])
AM_CONDITIONAL([EMOTION_BUILD_GENERIC], [false])
AM_CONDITIONAL([EMOTION_STATIC_BUILD_GENERIC], [false])
fi
EFL_LIB_END([Emotion])
#### End of Emotion
#### Ethumb
EFL_LIB_START_OPTIONAL([Ethumb], [test "x${build_gui}" = "xyes"])
EFL_LIB_START([Ethumb])
### Default values
@ -4365,11 +4220,12 @@ EFL_EVAL_PKGS([ETHUMB])
### Check availability
EFL_LIB_END_OPTIONAL([Ethumb])
EFL_LIB_END([Ethumb])
#### End of Ethumb
#### Ethumb_Client
EFL_LIB_START_OPTIONAL([Ethumb_Client], [test "x${build_gui}" = "xyes"])
EFL_LIB_START([Ethumb_Client])
### Default values
### Additional options to configure
@ -4407,7 +4263,7 @@ EFL_EVAL_PKGS([ETHUMB_CLIENT])
### Check availability
EFL_LIB_END_OPTIONAL([Ethumb_Client])
EFL_LIB_END([Ethumb_Client])
#### End of Ethumb_Client
#### Elua
@ -4736,8 +4592,7 @@ echo " Cryptography..: ${build_crypto}"
echo " X11...........: ${with_x11}"
echo " OpenGL........: ${with_opengl}"
echo " C++11.........: ${have_cxx11}"
echo " GUI libs......: ${build_gui}"
echo "Evas............: ${efl_lib_optional_evas} (${features_evas})"
echo "Evas............: yes (${features_evas})"
echo " Engines.......: ${features_evas_engine}"
echo " Image Loaders.: ${features_evas_loader}"
if test "x${have_pixman}" = "xyes" ; then
@ -4749,7 +4604,7 @@ echo "Eina............: yes (${features_eina})"
echo "Ecore...........: yes (${features_ecore})"
echo "Ecore_Con.......: yes (${features_ecore_con})"
echo "Ecore_File......: yes"
echo "Ecore_IMF.......: ${efl_lib_optional_ecore_imf} (${features_ecore_imf})"
echo "Ecore_IMF.......: yes (${features_ecore_imf})"
echo "Ecore_X.........: ${with_x11} (${features_ecore_x})"
echo "Ecore_SDL.......: $want_sdl"
echo "Ecore_Wayland...: $want_wayland"
@ -4765,13 +4620,13 @@ echo "Ecore_Win32.....: $have_win32"
fi
echo "Ecore_Audio.....: ${efl_lib_optional_ecore_audio} (${features_ecore_audio})"
echo "Ecore_Avahi.....: yes (${features_ecore_avahi})"
echo "Ecore_Evas......: ${efl_lib_optional_ecore_evas} (${features_ecore_evas})"
echo "Ecore_Evas......: yes (${features_ecore_evas})"
echo "Eeze............: ${efl_lib_optional_eeze} (${features_eeze})"
echo "EPhysics........: ${efl_lib_optional_ephysics}"
echo "Edje............: ${efl_lib_optional_edje} (${features_edje})"
echo "Emotion.........: ${efl_lib_optional_emotion} (${features_emotion})"
echo "Ethumb..........: ${efl_lib_optional_ethumb}"
echo "Ethumb_Client...: ${efl_lib_optional_ethumb_client}"
echo "Edje............: yes (${features_edje})"
echo "Emotion.........: yes (${features_emotion})"
echo "Ethumb..........: yes"
echo "Ethumb_Client...: yes"
echo "Elua............: $have_elua"
if test "${build_tests}" = "none"; then
echo "Tests...........: no"

View File

@ -63,8 +63,6 @@ CLEANFILES += libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py
EXTRA_DIST += $(eogdb_SCRIPTS) eo/libeo-gdb.py.in
if BUILD_GUI
########################################################################
# Edje
edjefilesdir = $(datadir)/edje/include
@ -111,7 +109,6 @@ ethumb/frames/border-0.jpg
ethumb_clientfilesdir = $(datadir)/ethumb_client
ethumb_clientfiles_DATA = ethumb_client/checkme
EXTRA_DIST += $(ethumb_clientfiles_DATA)
endif
########################################################################
# Elua

View File

@ -1,4 +1,3 @@
if BUILD_GUI
if EFL_BUILD_DOC
.PHONY: doc
@ -64,10 +63,10 @@ doc: Makefile previews-data
endif
endif
endif
EXTRA_DIST = preview_text_filter.c
clean-local:
rm -rf $(DATADIR)

View File

@ -33,19 +33,11 @@ include Makefile_Eo.am
include Makefile_Efl.am
include Makefile_Eet.am
include Makefile_Eolian.am
include Makefile_Evas.am
include Makefile_Ecore.am
include Makefile_Ecore_Con.am
include Makefile_Ecore_Ipc.am
include Makefile_Ecore_File.am
include Makefile_Ecore_Avahi.am
include Makefile_Embryo.am
include Makefile_Eio.am
include Makefile_Eldbus.am
include Makefile_Efreet.am
include Makefile_Eeze.am
if BUILD_GUI
include Makefile_Evas.am
include Makefile_Ecore_Input.am
include Makefile_Ecore_Input_Evas.am
include Makefile_Ecore_Cocoa.am
@ -56,21 +48,23 @@ include Makefile_Ecore_SDL.am
include Makefile_Ecore_Wayland.am
include Makefile_Ecore_Win32.am
include Makefile_Ecore_X.am
include Makefile_Ecore_Audio.am
include Makefile_Ecore_IMF.am
include Makefile_Ecore_IMF_Evas.am
include Makefile_Ecore_Evas.am
include Makefile_Ecore_Audio.am
include Makefile_Ecore_Audio_Cxx.am
include Makefile_Ecore_Avahi.am
include Makefile_Embryo.am
include Makefile_Eio.am
include Makefile_Eldbus.am
include Makefile_Efreet.am
include Makefile_Eeze.am
include Makefile_EPhysics.am
include Makefile_Edje.am
include Makefile_Emotion.am
include Makefile_Ethumb.am
include Makefile_Ethumb_Client.am
include Makefile_Ecore_Audio_Cxx.am
include Makefile_Edje_Cxx.am
include Makefile_Evas_Cxx.am
endif
include Makefile_Eina_Cxx.am
include Makefile_Ecore_Cxx.am
include Makefile_Eldbus_Cxx.am
@ -78,6 +72,9 @@ include Makefile_Eolian_Cxx.am
include Makefile_Eet_Cxx.am
include Makefile_Eo_Cxx.am
include Makefile_Efl_Cxx.am
include Makefile_Edje_Cxx.am
include Makefile_Evas_Cxx.am
include Makefile_Elua.am
include Makefile_Elocation.am