Bug 849085: Port build/autoconf/acwinpaths.m4 to autoconf 2.56.

Make configure.in require autoconf 2.56 and regenerate configure
with autoconf 2.56. Add datarootdir to config/autoconf.mk.in.
r=benjamin.

1 files changed, 9 insertions, 27 deletions

diff --git a/build/autoconf/acwinpaths.m4 b/build/autoconf/acwinpaths.m4
index ad9c754b..226b19ef 100644
--- a/build/autoconf/acwinpaths.m4
+++ b/build/autoconf/acwinpaths.m4
@@ -2,30 +2,12 @@ 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/.
 
-define(GENERATE_SUB_ABS, [
-define([AC_OUTPUT_FILES_SUB1], [
-patsubst($@, [/\*)], [/* | ?:/*)])
-])
-])
-GENERATE_SUB_ABS(defn([AC_OUTPUT_FILES]))
-
-define(GENERATE_SUB_NOSPLIT, [
-define([AC_OUTPUT_FILES], [
-patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
-])
-])
-GENERATE_SUB_NOSPLIT(defn([AC_OUTPUT_FILES_SUB1]))
-
-define(GENERATE_HEADER_NOSPLIT, [
-define([AC_OUTPUT_HEADER], [
-patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
-])
-])
-GENERATE_HEADER_NOSPLIT(defn([AC_OUTPUT_HEADER]))
-
-define(GENERATE_SUBDIRS_ABS, [
-define([AC_OUTPUT_SUBDIRS], [
-patsubst($@, [/\*)], [/* | ?:/*)])
-])
-])
-GENERATE_SUBDIRS_ABS(defn([AC_OUTPUT_SUBDIRS]))
+dnl Work around the problem that a DOS-style absolute path is split by
+dnl the colon in autoconf 2.59 and earlier. The _AC_OUTPUT_FILES macro
+dnl was removed and the problem was fixed in autoconf 2.60.
+define(GENERATE_FILES_NOSPLIT, [
+define([_AC_OUTPUT_FILES],
+       [patsubst($@, [`IFS=:], [`#IFS=:])])
+])
+m4_ifdef([_AC_OUTPUT_FILES],
+         [GENERATE_FILES_NOSPLIT(defn([_AC_OUTPUT_FILES]))])