[ooo-build-commit] 3 commits - bin/unpack configure.in download.in patches/dev300

[Thorsten Behrens]

 bin/unpack                                |    4 ++--
 configure.in                              |    7 ++-----
 download.in                               |    2 +-
 patches/dev300/apply                      |    7 ++-----
 patches/dev300/readlicense-build-fix.diff |   13 -------------
 5 files changed, 7 insertions(+), 26 deletions(-)

New commits:
commit 29ce9237b1f263d11dd8af221fb8b9db70afd463
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Fri Sep 4 13:55:57 2009 +0200

    Removed silly fix again, superseded by with-lang not given
    
    * patches/dev300/apply: removed below patch
    * patches/dev300/readlicense-build-fix.diff: deleted

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a890466..303302e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -983,9 +983,6 @@ postset-add-ro.diff
 # [which is a broken setup, but apparently most apps don't break with that ;-)] 
 dmake-space-in-envvar-name.diff, i#101786, jholesov
 
-# make readlicense build again with various WITH_LANG settings
-readlicense-build-fix.diff, thorsten
-
 [ Java14 ]
 
 # enable build with Java 1.4; can't go upstream
diff --git a/patches/dev300/readlicense-build-fix.diff b/patches/dev300/readlicense-build-fix.diff
deleted file mode 100644
index f55a67c..0000000
--- a/patches/dev300/readlicense-build-fix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- readlicense_oo/util/makefile.pmk~	2009-08-11 03:54:57.000000000 +0200
-+++ readlicense_oo/util/makefile.pmk	2009-09-04 10:25:43.000000000 +0200
-@@ -38,9 +38,7 @@
- SYSHTMLDOCS=$(SYSTEXTDOCS:s/.txt/.html/)
- .ENDIF		# "$(GUI)"=="UNX"
- 
--.IF "$(WITH_LANG)"!=""
--MERGEDXRM=$(COMMONMISC)$/$(TARGET)$/readme.xrm
--.ELSE		# "$(WITH_LANG)"!=""
-+.IF "$(WITH_LANG)"==""
- MERGEDXRM=.$/readme.xrm
- .ENDIF		# "$(WITH_LANG)"!=""
- 
commit f27c837679523708d6507fe0e01ebd354464260d
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Fri Sep 4 13:52:52 2009 +0200

    Made layout dialogs disabled by default (temporarily)
    
    * patches/dev300/apply: commented out configure changes that
      made layout dialogs enabled by default, as they currently
      break the build

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3ff06ba..a890466 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -835,7 +835,7 @@ solenv-really-use-unsinged-char-on-ppc.diff, i#81127, n#169875, pmladek
 #printer-properties-disable.diff, i#14036, michael
 
 # Enable layout'ed dialogs.  Not to be released, therefore NotDebian.
-layout-default-enable-config_office.diff, janneke
+#layout-default-enable-config_office.diff, janneke
 
 [ CustomUserConfig ]
 
@@ -2360,7 +2360,7 @@ wmf-pattern-brush.diff, n#232232, rodo
 toolkit-layout-gcc-4.3.2-hack.diff, pmladek
 
 # These merge with the layoutdialogs2 cws
-layout-disable-experimental.diff
+#layout-disable-experimental.diff
 
 layout-accessibility-dispose-only-once.diff, n#500267, janneke
 
commit 0f592f7f50fd37a5be24e15461ce61fd214dd77a
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Fri Sep 4 13:43:14 2009 +0200

    Do not pass --with-lang=en-US by default
    
    Upstream has changed the semantics of the WITH_LANG env var;
    setting it now unconditionally requires localization tools to
    run. So for the plain, en-US-only build, *do not* pass
    --with-lang at all, otherwise a gazillion places want l10n
    
    * bin/unpack: made OOO_LANG == "" aware
    * configure.in: changed default of OOO_LANG
    * download.in: made OOO_LANG == "" aware

diff --git a/bin/unpack b/bin/unpack
index 0501bba..8b04ee6 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -80,7 +80,7 @@ if test "z$OOO_GIT" = "z" ; then
 	else
 	    CORE_PKGS=$ALL_CORE_PKGS
 	fi
-	if test "z$OOO_LANGS" != "zen-US" -o "z$BUILD_WIN32" != "z"; then
+	if test \( "z$OOO_LANGS" != "z" -a "z$OOO_LANGS" != "zen-US" \) -o "z$BUILD_WIN32" != "z"; then
 	    CORE_PKGS="$CORE_PKGS l10n"
 	fi
 	for pkg in $CORE_PKGS; do
@@ -97,7 +97,7 @@ else
     else
         CORE_PKGS=$ALL_CORE_PKGS
     fi
-    if test "z$OOO_LANGS" != "zen-US" -o "z$BUILD_WIN32" != "z"; then
+    if test \( "z$OOO_LANGS" != "z" -a "z$OOO_LANGS" != "zen-US" \) -o "z$BUILD_WIN32" != "z"; then
         CORE_PKGS="$CORE_PKGS l10n"
     fi
     for pkg in $CORE_PKGS ; do
diff --git a/configure.in b/configure.in
index f61dde3..3ed1934 100644
--- a/configure.in
+++ b/configure.in
@@ -1089,11 +1089,8 @@ AC_SUBST(docdir)
 #  --with-lang="en-US cs"
 #  --with-lang="ALL xy"
 AC_MSG_CHECKING([for requested localizations])
-if test "z$with_lang" = "z" -o "z$with_lang" = "zyes" ; then
-    with_lang="en-US"
-elif test "z$with_lang" = "zno" ; then
-    AC_MSG_WARN([One localization must be built, at least! Defaulting to English.])
-    with_lang="en-US"
+if test "z$with_lang" = "zno" ; then
+    AC_MSG_WARN([One localization is built by default, this happens to be English.])
 fi
 OOO_LANGS="$with_lang"
 AC_MSG_RESULT([$OOO_LANGS])
diff --git a/download.in b/download.in
index 8620a6f..d46276b 100755
--- a/download.in
+++ b/download.in
@@ -389,7 +389,7 @@ if ('@USE_PREBUILD_UNOWINREG_DLL@' eq 'YES') {
     source_file( "unowinreg.dll" );
 }
 
-if ( $download_all || '@OOO_LANGS@' ne 'en-US' || '@BUILD_WIN32@' ne '' ) {
+if ( $download_all || ( '@OOO_LANGS@' ne '' && '@OOO_LANGS@' ne 'en-US' ) || '@BUILD_WIN32@' ne '' ) {
     source_file_ooo( "l10n" );
 }