From 12cbd488915d0ff200a966d0055449c2a9c3fa22 Mon Sep 17 00:00:00 2001
From: "axel%pike.org" <axel%pike.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 14 Aug 2008 10:00:34 +0000
Subject: [PATCH] bug 445328, add configure option for l10n repositories,
 r=ted, a=ss

git-svn-id: svn://10.0.0.236/trunk@253583 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/config/autoconf.mk.in |  2 ++
 mozilla/config/config.mk      |  2 +-
 mozilla/configure.in          | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index b250e0851af..534460a677d 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -70,6 +70,8 @@ sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
 DIST		= $(DEPTH)/dist
 LIBXUL_SDK      = @LIBXUL_SDK@
 
+L10NBASEDIR     = @L10NBASEDIR@
+
 ifdef LIBXUL_SDK
 LIBXUL_DIST = $(LIBXUL_SDK)
 else
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 38e188b99f1..881255742ba 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -861,7 +861,7 @@ endif
 # overridden by the command line. (Besides, AB_CD is prettier).
 AB_CD = $(MOZ_UI_LOCALE)
 
-EXPAND_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/$(1)/en-US,$(topsrcdir)/../l10n/$(AB_CD)/$(subst /locales,,$(1)))
+EXPAND_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/$(1)/en-US,$(L10NBASEDIR)/$(AB_CD)/$(subst /locales,,$(1)))
 
 ifdef relativesrcdir
 LOCALE_SRCDIR = $(call EXPAND_LOCALE_SRCDIR,$(relativesrcdir))
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 4ce2f9e1e7a..bc72aff6f4f 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -202,6 +202,23 @@ MOZ_ARG_ENABLE_BOOL(compile-environment,
     COMPILE_ENVIRONMENT=1,
     COMPILE_ENVIRONMENT= )
 
+MOZ_ARG_WITH_STRING(l10n-base,
+[  --with-l10nbase=DIR     path to l10n repositories],
+    L10NBASEDIR=$withval)
+if test ! -z "$L10NBASEDIR"; then
+    if test "$L10NBASEDIR" = "yes" -o "$L10NBASEDIR" = "no"; then
+        AC_MSG_ERROR([--with-l10n-base must specify a path])
+    elif test -d "$L10NBASEDIR"; then
+        L10NBASEDIR=`cd "$L10NBASEDIR" && pwd`
+    else
+        AC_MSG_ERROR([Invalid value --with-l10n-base, $L10NBASEDIR doesn't exist])
+    fi
+else
+    dnl default to $(topsrcdir)/../l10n for 1.9
+    L10NBASEDIR='$(topsrcdir)/../l10n'
+fi
+AC_SUBST(L10NBASEDIR)
+
 dnl ========================================================
 dnl Checks for compilers.
 dnl ========================================================