From e7afcda3d03bb5950045cba1504041e91aff631b Mon Sep 17 00:00:00 2001
From: Ben Hearsum <bhearsum@mozilla.com>
Date: Mon, 11 Jun 2012 11:10:32 -0400
Subject: [PATCH] bug 758595: don't include CodeResources file in builds that
 aren't getting signed. r=ted

---
 browser/installer/package-manifest.in | 2 ++
 configure.in                          | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index d5761159b223..220341c874fc 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -24,8 +24,10 @@
 @APPNAME@/Contents/Info.plist
 @APPNAME@/Contents/PkgInfo
 @APPNAME@/Contents/Resources/
+#ifdef MOZ_SIGNING
 @APPNAME@/Contents/_CodeSignature/CodeResources
 #endif
+#endif
 
 [@AB_CD@]
 @BINPATH@/chrome/@AB_CD@@JAREXT@
diff --git a/configure.in b/configure.in
index 57615403fce9..cd778afd90fb 100644
--- a/configure.in
+++ b/configure.in
@@ -6417,6 +6417,14 @@ AC_CHECK_PROGS(WGET, wget, "")
 AC_MSG_RESULT([$WGET])
 AC_SUBST(WGET)
 
+dnl ========================================================
+dnl Signing
+dnl ========================================================
+
+if test -n "$MOZ_SIGN_CMD"; then
+    AC_DEFINE(MOZ_SIGNING)
+fi
+
 dnl ========================================================
 dnl Maintenance Service
 dnl ========================================================