Bug 1295751 - Make it possible to copy configure.in to configure. r=gps

MozReview-Commit-ID: 4Sjr7mWcMIN

--HG--
extra : rebase_source : 4c46a4853eaba6216751d71d3c507a431fd24d7e

client.mk

@@ -310,7 +310,7 @@ EXTRA_CONFIG_DEPS := \
 
 $(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS)
 	@echo Generating $@
-	sed '1,/^divert/d' $< > $@
+	cp -f $< $@
 	chmod +x $@
 
 CONFIG_STATUS_DEPS := \

configure.in

@@ -1,20 +1,21 @@
-dnl This Source Code Form is subject to the terms of the Mozilla Public
-dnl License, v. 2.0. If a copy of the MPL was not distributed with this
-dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
-dnl
-dnl Welcome to the new world of configure. We're working on moving to a
-dnl python based configure. In the meanwhile, remains of the old autoconf
-dnl based configure is in old-configure.in.
-dnl If you need to add something, please come talk to the build system
-dnl peers for now.
-dnl
-dnl Because adding a configure file in the tree is going to conflict with
-dnl existing configure files in people's (and automation) work trees, and
-dnl because some automation jobs are still running autoconf and configure
-dnl "manually", this file is actually an m4 file that is processed by
-dnl autoconf, but doesn't call any autoconf macros. The `divert` line
-dnl below ensures the script that follows is output by autoconf.
-divert(0)dnl
+#!/bin/sh
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Welcome to the new world of configure. We're working on moving to a
+# python based configure. In the meanwhile, remains of the old autoconf
+# based configure is in old-configure.in.
+# If you need to add something, please come talk to the build system
+# peers for now.
+#
+# Because adding a configure file in the tree is going to conflict with
+# existing configure files in people's (and automation) work trees, and
+# because some automation jobs are still running autoconf and configure
+# "manually", this file is actually an m4 file that is processed by
+# autoconf, but doesn't call any autoconf macros. The `divert` line
+# below ensures the script that follows is output by autoconf.
+: "divert(0)dnl"
 #!/bin/sh
 
 SRCDIR=$(dirname $0)

js/src/configure.in

@@ -1,20 +1,21 @@
-dnl This Source Code Form is subject to the terms of the Mozilla Public
-dnl License, v. 2.0. If a copy of the MPL was not distributed with this
-dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
-dnl
-dnl Welcome to the new world of configure. We're working on moving to a
-dnl python based configure. In the meanwhile, remains of the old autoconf
-dnl based configure is in old-configure.in.
-dnl If you need to add something, please come talk to the build system
-dnl peers for now.
-dnl
-dnl Because adding a configure file in the tree is going to conflict with
-dnl existing configure files in people's (and automation) work trees, and
-dnl because some automation jobs are still running autoconf and configure
-dnl "manually", this file is actually an m4 file that is processed by
-dnl autoconf, but doesn't call any autoconf macros. The `divert` line
-dnl below ensures the script that follows is output by autoconf.
-divert(0)dnl
+#!/bin/sh
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Welcome to the new world of configure. We're working on moving to a
+# python based configure. In the meanwhile, remains of the old autoconf
+# based configure is in old-configure.in.
+# If you need to add something, please come talk to the build system
+# peers for now.
+#
+# Because adding a configure file in the tree is going to conflict with
+# existing configure files in people's (and automation) work trees, and
+# because some automation jobs are still running autoconf and configure
+# "manually", this file is actually an m4 file that is processed by
+# autoconf, but doesn't call any autoconf macros. The `divert` line
+# below ensures the script that follows is output by autoconf.
+: "divert(0)dnl"
 #!/bin/sh
 
 SRCDIR=$(dirname $0)