support building with subversion 1.7 #6094
diff --git a/Makefile.pre.in b/Makefile.pre.in
index f6844f9..eff2f58 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -505,7 +505,7 @@
$(SIGNAL_OBJS) \
$(MODOBJS) \
$(srcdir)/Modules/getbuildinfo.c
- $(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
+ $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c
Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
diff --git a/Misc/ACKS b/Misc/ACKS
index ccb7827..29c1b1d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -22,6 +22,7 @@
Erik Andersén
Oliver Andrich
Ross Andrus
+Arfrever Frehtes Taifersar Arahesis
Jason Asbahr
David Ascher
Chris AtLee
diff --git a/Misc/NEWS b/Misc/NEWS
index ba1e7e4..deb8a0b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -958,6 +958,8 @@
Build
-----
+- Issue #6094: Build correctly with Subversion 1.7.
+
- Issue #5847: Remove -n switch on "Edit with IDLE" menu item.
- Issue #5726: Make Modules/ld_so_aix return the actual exit code of the
diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
index b673f3f..f4bd14a 100644
--- a/Modules/getbuildinfo.c
+++ b/Modules/getbuildinfo.c
@@ -48,5 +48,5 @@
static const char svnversion[] = SVNVERSION;
if (svnversion[0] != '$')
return svnversion; /* it was interpolated, or passed on command line */
- return "exported";
+ return "Unversioned directory";
}
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 6c22b8f..1146746 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1158,7 +1158,7 @@
svnversion = _Py_svnversion();
- if (strcmp(svnversion, "exported") != 0)
+ if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0)
svn_revision = svnversion;
else if (istag) {
len = strlen(_patchlevel_revision);
diff --git a/configure b/configure
index 54c93c0..b8bbc85 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 72497 .
+# From configure.in Revision: 72799 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.7.
#
@@ -4385,7 +4385,7 @@
then
SVNVERSION="svnversion \$(srcdir)"
else
- SVNVERSION="echo exported"
+ SVNVERSION="echo Unversioned directory"
fi
case $MACHDEP in
diff --git a/configure.in b/configure.in
index 04ead30..b270e08 100644
--- a/configure.in
+++ b/configure.in
@@ -802,7 +802,7 @@
then
SVNVERSION="svnversion \$(srcdir)"
else
- SVNVERSION="echo exported"
+ SVNVERSION="echo Unversioned directory"
fi
case $MACHDEP in