From 2716f9bc5f947ffdd2835c2a820ca8d35544630e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Apr 2007 12:00:13 +0000 Subject: [PATCH] * 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. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7a1c283a20..bc52859c24 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)