about summary refs log tree commit diff
path: root/configure.ac
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2007-04-16T12·00+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2007-04-16T12·00+0000
commit2716f9bc5f947ffdd2835c2a820ca8d35544630e (patch)
tree5122d97ac2b12313d3acba565c01ce756019d83b /configure.ac
parentae7990cc88dcc6a61edfe9e442174bc5b1bc3299 (diff)
* It seems that svnversion prints a carriage return on Cygwin, so we
  get a invalid #define VERSION.  Use "svnversion -n" to leave out the
  newline.  Fix provided by Marc Weber.

Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 7a1c283a20b1..bc52859c248d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,14 +9,14 @@ STABLE=0
 
 # Put the revision number in the version.
 if test "$STABLE" != "1"; then
-    if REVISION=`test -d $srcdir/.svn && svnversion $srcdir 2> /dev/null`; then
+    if REVISION=`test -d $srcdir/.svn && svnversion -n $srcdir 2> /dev/null`; then
         VERSION=${VERSION}pre${REVISION}
     elif REVISION=`cat $srcdir/svn-revision 2> /dev/null`; then
         VERSION=${VERSION}pre${REVISION}
     fi
 fi
 
-AC_DEFINE_UNQUOTED(NIX_VERSION, ["$(echo $VERSION)"], [version])
+AC_DEFINE_UNQUOTED(NIX_VERSION, ["$VERSION"], [version])
 
 AC_PREFIX_DEFAULT(/nix)