Always set SVNVERSION to "exported" if it otherwise fails.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 3d08837efb6048481fdb13a1da2c21d731a9c9b9..1cc43e60cba32794389d5b4f52a920e1e96db299 100644 (file)
--- 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 7343a0fcf2732090c3876346eb24049470f6b025..1ff061f99d2a39d313fc41dec366162dce248a69 100644 (file)
--- 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 d36537f608e9239891d7e257b3312edcf927e5da..a59889e2243b3411653a2b35f30e28220d02ba02 100755 (executable)
--- 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 16368a7f5acdf1c85268e6411384da3d91590997..acd0168fb5b3dac959ee7b1393fe9463270373c8 100644 (file)
--- 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*)