diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-02-29 21:33:38 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-03-02 17:10:08 +0100 |
| commit | 3fd13a33670e8526bfe32bd4af83315cb35db697 (patch) | |
| tree | 255fc6e71100a64c5cea15848dba36c5bfb68ca7 /configure.ac | |
| parent | e7fe70ff9cad56176c67f26e365c990f0be94e6c (diff) | |
configure: try to make --without-x less confusing
In a supreme twist of irony, people now assume that --without-x somehow
enables them to run LO in Wayland. Let's see if renaming it *again*
to --disable-gui is finally clear enough.
Change-Id: I5993ee63670f43fb90f32f375f8b0632478c8283
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 6b405e434054..e64c713d2676 100644 --- a/configure.ac +++ b/configure.ac @@ -1265,6 +1265,13 @@ AC_ARG_ENABLE(kde4, KDE4 are available.]), ,) +AC_ARG_ENABLE(gui, + AS_HELP_STRING([--disable-gui], + [Disable X11/Wayland support to reduce dependencies. Maybe useful for + headless servers, but soffice --headless works just fine without it. + Work in progress, use only if you are hacking on it.]), +,enable_gui=yes) + AC_ARG_ENABLE(randr, AS_HELP_STRING([--disable-randr], [Disable RandR support in the vcl project.]), @@ -4541,8 +4548,12 @@ solaris*) esac if test "$with_x" = "no"; then + AC_MSG_ERROR([Use --disable-gui instead. How can we get rid of this option? No idea where it comes from.]) +fi + +if test "$enable_gui" = "no"; then if test "$USING_X11" != TRUE; then - AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice with --without-x]) + AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice with --disable-gui.]) fi USING_X11= fi |