[Libreoffice-commits] .: Branch 'libreoffice-4-0' - configure.ac

[Libreoffice Gerrit user]

 configure.ac |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 47137c59e0910dc99820df712307e781e93ed1de
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Dec 20 09:26:55 2012 +0100

    Thou shall not mention qtz twice, thy packaging breaketh
    
    Conflicts:
    	configure.ac
    
    Change-Id: Icd65d8a456cf59b6e4b6b6bfb095c0bff498bcbc

diff --git a/configure.ac b/configure.ac
index 29b4eb7..064a2e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11466,11 +11466,7 @@ AC_MSG_CHECKING([which languages to be built])
 #   + removes en-US; we want to put it on the beginning
 #   + prints just the section starting with 'completelangiso=' and ending with the " at the end of line
 [eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e 's/=/="/;s/\([^\\]\)$/\1"/;s/en-US//;/^completelangiso/p' solenv/inc/langlist.mk)]
-if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
-    ALL_LANGS="en-US $completelangiso qtz"
-else
-    ALL_LANGS="en-US $completelangiso"
-fi
+ALL_LANGS="en-US $completelangiso"
 # check the configured localizations
 WITH_LANG="$with_lang"
 if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then
@@ -11498,6 +11494,7 @@ test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US"
 test "$WITH_LANG" = "en-US" && WITH_LANG=
 if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
     test "$WITH_LANG_LIST" = "en-US" || WITH_LANG_LIST=`echo $WITH_LANG_LIST qtz`
+    ALL_LANGS=`echo $ALL_LANGS qtz`
 fi
 AC_SUBST(ALL_LANGS)
 AC_SUBST(WITH_LANG)