From f6787d3a719bef1af600aaddcc7106d3dd9d8fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 29 Jul 2015 11:41:13 +0000
Subject: [PATCH] build fixes for rpm - centos 5/6 don't know m4_esyscmd_s

---
 ax_init_standard_project.m4 | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 965793b..4986671 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -3,14 +3,17 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
+# m4_esyscmd_s does not exist on centos 5 and 6
+m4_define([mrw_esyscmd_s], [m4_normalize(m4_esyscmd([$1]))])
+
 # define least version number from subversion's revision number:
 # it is taken modulo 256 due to a bug on Apple's MacOSX
-m4_define(x_least, m4_esyscmd([
+m4_define(x_least, mrw_esyscmd_s([
   SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-      (cd $path && svn2cl)
+      (cd $path && svn2cl) 2>&1 > /dev/null
       break;
     fi
   done
@@ -20,12 +23,12 @@ m4_define(x_least, m4_esyscmd([
 # define version number from subversion's revision number:
 # it is taken modulo 256 due to a bug on Apple's MacOSX
 # add to x_minor if revision number is > 256
-m4_define(x_minor_fixed, m4_esyscmd([
+m4_define(x_minor_fixed, mrw_esyscmd_s([
   SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-      (cd $path && svn2cl)
+      (cd $path && svn2cl) 2>&1 > /dev/null
       break;
     fi
   done
@@ -33,12 +36,12 @@ m4_define(x_minor_fixed, m4_esyscmd([
   echo $ECHO_N $((x_minor+$SVN_REVISION/256))
 ]))
 # setup version number
-m4_define(x_version, m4_esyscmd([
+m4_define(x_version, mrw_esyscmd_s([
   echo $ECHO_N x_major.x_minor_fixed.x_least
 ]))
 
 ## bugreport mail address is taken from <user@host> in first line of AUTHORS
-m4_define(x_bugreport, m4_esyscmd([
+m4_define(x_bugreport, mrw_esyscmd_s([
   head -1 AUTHORS | \
     sed -n 's,.*<\([-_.a-z0-9A-Z]*@[-_.a-z0-9A-Z]*\)>.*,\1,gp'
 ]))