summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko Koppanen <mikko.koppanen@gmail.com>2011-02-07 15:06:20 +0100
committerMartin Sustrik <sustrik@250bpm.com>2011-02-07 15:06:20 +0100
commit908b39bf8309044913a34c632cd432958dcf6960 (patch)
tree7975075e1fe1a5e72820215a26534f6fa687307c
parentc8e5be87d82e73cfc8a6655d2c2b6779f7c223a5 (diff)
m4_esyscmd_s doesnt seem to be portable across different systems
Signed-off-by: Mikko Koppanen <mikko.koppanen@gmail.com>
-rw-r--r--configure.in2
-rwxr-xr-xversion.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 7608632..ae7cd44 100644
--- 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
index b88bb61..b4425d0 100755
--- 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'