Mesa (master): autoconf: Also strip '\r' character in version scrape.
Vinson Lee
vlee at kemper.freedesktop.org
Tue May 11 19:38:21 UTC 2010
Module: Mesa
Branch: master
Commit: 48f8a76549aa2001090c7a5e1fa40891954ff01f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=48f8a76549aa2001090c7a5e1fa40891954ff01f
Author: Vinson Lee <vlee at vmware.com>
Date: Tue May 11 12:33:30 2010 -0700
autoconf: Also strip '\r' character in version scrape.
Fixes autoconf GCC conftest.c test on Cygwin.
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 83aa31d..3207c9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ([2.59])
dnl Versioning - scrape the version from configs/default
m4_define([mesa_version],
- [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n'])])
+ [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n' | tr -d '\r'])])
m4_ifval(mesa_version,,
[m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])])
More information about the mesa-commit
mailing list