merge changes for OPEN-39

1 files changed, 14 insertions, 2 deletions

diff --git a/build.sh b/build.sh
index bb645b4d7e..6677958716 100755
--- a/build.sh
+++ b/build.sh
@@ -51,8 +51,20 @@ pre_build()
 {
   local variant="$1"
   begin_section "Pre$variant"
-    "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE "-DVIEWER_CHANNEL:STRING=\"$viewer_channel\"" "-DVIEWER_LOGIN_CHANNEL:STRING=\"$viewer_login_channel\""
-  end_section "Pre$variant"
+    [ -n "$master_message_template_checkout" ] \
+    && [ -r "$master_message_template_checkout/message_template.msg" ] \
+    && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg"
+
+    "$AUTOBUILD" configure -c $variant -- \
+     -DPACKAGE:BOOL=ON \
+     -DRELEASE_CRASH_REPORTING:BOOL=ON \
+     -DUSE_PRECOMPILED_HEADERS=FALSE \
+     -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \
+     -DVIEWER_LOGIN_CHANNEL:STRING="\"$viewer_login_channel\"" \
+     -DGRID:STRING="\"$viewer_grid\"" \
+     -DLL_TESTS:BOOL="$run_tests" \
+     -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
+ end_section "Pre$variant"
 }
 
 build()