m4_esyscmd_s doesnt seem to be portable across different systems

testraymond · sustrik · commit 908b39bf8309 · 2011-02-07T15:06:20.000+01:00
Signed-off-by: Mikko Koppanen &lt;mikko.koppanen@gmail.com&gt;
diff --git a/configure.in b/configure.in
@@ -6,7 +6,7 @@ AC_PREREQ(2.61)
 # the version.sh script. Hence, it should be updated there.
 # The version in git should reflect the *next* version planned.
 #
-AC_INIT([zeromq],[m4_esyscmd_s([./version.sh])],[zeromq-dev@lists.zeromq.org])
+AC_INIT([zeromq],[m4_esyscmd([./version.sh])],[zeromq-dev@lists.zeromq.org])
 
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
diff --git a/version.sh b/version.sh
@@ -17,5 +17,5 @@ fi
 MAJOR=`echo $MAJOR | awk '{ print $3 }'`
 MINOR=`echo $MINOR | awk '{ print $3 }'`
 PATCH=`echo $PATCH | awk '{ print $3 }'`
-echo $MAJOR.$MINOR.$PATCH
+echo $MAJOR.$MINOR.$PATCH | tr -d '\n'
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ AC_PREREQ(2.61)`
`6`	`6`	`# the version.sh script. Hence, it should be updated there.`
`7`	`7`	`# The version in git should reflect the next version planned.`
`8`	`8`	`#`
`9`		`-AC_INIT([zeromq],[m4_esyscmd_s([./version.sh])],[[email protected]])`
	`9`	`+AC_INIT([zeromq],[m4_esyscmd([./version.sh])],[[email protected]])`
`10`	`10`
`11`	`11`	`AC_CONFIG_AUX_DIR(config)`
`12`	`12`	`AC_CONFIG_MACRO_DIR(config)`