aboutsummaryrefslogtreecommitdiffhomepage
path: root/configure.ac
diff options
context:
space:
mode:
authorGravatar David Adam (zanchey) <zanchey@ucc.gu.uwa.edu.au>2013-08-17 10:47:35 +0800
committerGravatar David Adam (zanchey) <zanchey@ucc.gu.uwa.edu.au>2013-08-17 10:47:35 +0800
commitd371af05040386110db32850ca4698e642c484dc (patch)
tree15f5e371b6faefd6f5f86ddd95e8509906aa5d82 /configure.ac
parent3e115b7a85184d16a5bb8d00fff702a62e3f8fea (diff)
configure.ac: remove m4_esyscmd_s
m4_esyscmd_s is a macro only available in Autoconf 2.64, which despite being released in 2009 is not available on a number of build targets for the project (specifically CentOS/RHEL 6). ca8e4c08a78 tries to remove the error produced with m4_pattern_allow, but that just silences the sanity check. Instead, replace m4_esyscmd_s with m4_esyscmd + manual removal of newlines.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index d7fa1482..6a42e600 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,12 +8,10 @@
# configure the build process.
#
-m4_pattern_allow(m4_esyscmd_s)
-
m4_syscmd([build_tools/git_version_gen.sh 2>/dev/null])
AC_INIT(fish,
- m4_esyscmd_s([cut -f 3 -d ' ' FISH-BUILD-VERSION-FILE]),
+ m4_esyscmd([cut -f 3 -d ' ' FISH-BUILD-VERSION-FILE | tr -d '\n']),
fish-users@lists.sf.net)
conf_arg=$@