From c5bf5a00a35dae7d31d1b6eeada0567d7973c5c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 5 Jan 2006 10:33:59 +0000
Subject: [PATCH] Always set SVNVERSION to "exported" if it otherwise fails.

---
 Makefile.pre.in        |  2 +-
 Modules/getbuildinfo.c | 12 +++++++-----
 configure              | 20 ++++++++++----------
 configure.in           |  8 +++++++-
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 3d08837efb6..1cc43e60cba 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -438,7 +438,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
 		$(SIGNAL_OBJS) \
 		$(MODOBJS) \
 		$(srcdir)/Modules/getbuildinfo.c
-	$(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LANG=C $(SVNVERSION) $(srcdir)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
+	$(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LANG=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
 
 Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
 	$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
index 7343a0fcf27..1ff061f99d2 100644
--- a/Modules/getbuildinfo.c
+++ b/Modules/getbuildinfo.c
@@ -28,15 +28,17 @@ Py_GetBuildInfo(void)
 {
 	static char buildinfo[50];
 #ifdef SVNVERSION
-	static char svnversion[] = SVNVERSION;
+	static char svnversion[50] = SVNVERSION;
 #else
-	static char svnversion[20] = "unknown";
-	if (strstr(headurl, "/tags/") != NULL) {
-		int start = ;
+	static char svnversion[50] = "exported";
+#endif
+	if (strcmp(svnversion, "exported") == 0 &&
+	    strstr(headurl, "/tags/") != NULL) {
+		int start = 11;
+		int stop = strlen(revision)-2;
 		strncpy(svnversion, revision+start, stop-start);
 		svnversion[stop-start] = '\0';
 	}
-#endif
 	PyOS_snprintf(buildinfo, sizeof(buildinfo),
 		      "%s, %.20s, %.9s", svnversion, DATE, TIME);
 	return buildinfo;
diff --git a/configure b/configure
index d36537f608e..a59889e2243 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 41852 .
+# From configure.in Revision: 41923 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.5.
 #
@@ -3576,10 +3576,8 @@ test -n "$AR" || AR="ar"
 
 
 
-for ac_prog in svnversion
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+# Extract the first word of "svnversion", so it can be a program name with args.
+set dummy svnversion; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_SVNVERSION+set}" = set; then
@@ -3595,7 +3593,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_SVNVERSION="$ac_prog"
+    ac_cv_prog_SVNVERSION="found"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -3613,10 +3611,12 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
-  test -n "$SVNVERSION" && break
-done
-test -n "$SVNVERSION" || SVNVERSION="echo no svnversion"
-
+if test $SVNVERSION = found
+then
+	SVNVERSION="svnversion \$(srcdir)"
+else
+	SVNVERSION="echo exported"
+fi
 
 case $MACHDEP in
 bsdos*|hp*|HP*)
diff --git a/configure.in b/configure.in
index 16368a7f5ac..acd0168fb5b 100644
--- a/configure.in
+++ b/configure.in
@@ -619,7 +619,13 @@ AC_SUBST(AR)
 AC_CHECK_PROGS(AR, ar aal, ar)
 
 AC_SUBST(SVNVERSION)
-AC_CHECK_PROGS(SVNVERSION, svnversion, [echo no svnversion])
+AC_CHECK_PROG(SVNVERSION, svnversion, found)
+if test $SVNVERSION = found
+then
+	SVNVERSION="svnversion \$(srcdir)"
+else
+	SVNVERSION="echo exported"
+fi
 
 case $MACHDEP in
 bsdos*|hp*|HP*)