[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist]

 configure.ac |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 434c730a889685ecf2df068dcf2db65124f9b8d6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jun 15 15:26:14 2018 +0300

    Don't croak on --without-lang
    
    Change-Id: I23e21b5d108fcc4bfc4422bebbc50389565e36fb
    Reviewed-on: https://gerrit.libreoffice.org/55864
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index c0ff933ca4dd..724de9449c03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11949,6 +11949,13 @@ AC_MSG_CHECKING([which languages to be built])
 ALL_LANGS="en-US $completelangiso"
 # check the configured localizations
 WITH_LANG="$with_lang"
+
+# Check for --without-lang which turns up as $with_lang being "no". Luckily there is no language with code "no".
+# (Norwegian is "nb" and "nn".)
+if test "$WITH_LANG" = "no"; then
+    WITH_LANG=
+fi
+
 if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then
     AC_MSG_RESULT([en-US])
 else