updated for version 7.3.613

Problem:    Including Python's config.c in the build causes trouble.  It is
            not clear why it was there.
Solution:   Omit the config file. (James McCoy)

diff --git a/src/Makefile b/src/Makefile
index 811d4a63e15ecbe9bb23eb0c212ea3fd02de0dd2..36a26acd1a848f0ad00da9a121e96358fed53bc9 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2559,19 +2559,11 @@ objects/if_perl.o: auto/if_perl.c
 objects/if_perlsfio.o: if_perlsfio.c
        $(CCC) $(PERL_CFLAGS) -o $@ if_perlsfio.c
 
-objects/py_config.o: $(PYTHON_CONFDIR)/config.c
-       $(CCC) $(PYTHON_CFLAGS) -o $@ $(PYTHON_CONFDIR)/config.c \
-               -I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN
-
 objects/py_getpath.o: $(PYTHON_CONFDIR)/getpath.c
        $(CCC) $(PYTHON_CFLAGS) -o $@ $(PYTHON_CONFDIR)/getpath.c \
                -I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN \
                $(PYTHON_GETPATH_CFLAGS)
 
-objects/py3_config.o: $(PYTHON3_CONFDIR)/config.c
-       $(CCC) $(PYTHON3_CFLAGS) -o $@ $(PYTHON3_CONFDIR)/config.c \
-               -I$(PYTHON3_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN
-
 objects/if_python.o: if_python.c if_py_both.h
        $(CCC) $(PYTHON_CFLAGS) $(PYTHON_CFLAGS_EXTRA) -o $@ if_python.c
 

diff --git a/src/auto/configure b/src/auto/configure
index ae0d12157a794c5ac33b579d978970b28203f148..68be9f3279f437c32369542b9d43235482d67d6d 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5357,11 +5357,7 @@ fi
          PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
        fi
        PYTHON_SRC="if_python.c"
-               if test "x$MACOSX" = "xyes"; then
-         PYTHON_OBJ="objects/if_python.o"
-       else
-         PYTHON_OBJ="objects/if_python.o objects/py_config.o"
-       fi
+       PYTHON_OBJ="objects/if_python.o"
        if test "${vi_cv_var_python_version}" = "1.4"; then
           PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
        fi
@@ -5656,11 +5652,7 @@ fi
         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
       fi
       PYTHON3_SRC="if_python3.c"
-            if test "x$MACOSX" = "xyes"; then
-        PYTHON3_OBJ="objects/if_python3.o"
-      else
-        PYTHON3_OBJ="objects/if_python3.o objects/py3_config.o"
-      fi
+      PYTHON3_OBJ="objects/if_python3.o"
 
                                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
 $as_echo_n "checking if -pthread should be used... " >&6; }

diff --git a/src/configure.in b/src/configure.in
index 743990437b6a43eef7390f7fc8a2db740b8a95af..fb6aed0d476b9431f744c6854813bee71d97ad25 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -916,12 +916,7 @@ eof
          PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
        fi
        PYTHON_SRC="if_python.c"
-       dnl For Mac OSX 10.2 config.o is included in the Python library.
-       if test "x$MACOSX" = "xyes"; then
-         PYTHON_OBJ="objects/if_python.o"
-       else
-         PYTHON_OBJ="objects/if_python.o objects/py_config.o"
-       fi
+       PYTHON_OBJ="objects/if_python.o"
        if test "${vi_cv_var_python_version}" = "1.4"; then
           PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
        fi
@@ -1106,12 +1101,7 @@ eof
         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
       fi
       PYTHON3_SRC="if_python3.c"
-      dnl For Mac OSX 10.2 config.o is included in the Python library.
-      if test "x$MACOSX" = "xyes"; then
-        PYTHON3_OBJ="objects/if_python3.o"
-      else
-        PYTHON3_OBJ="objects/if_python3.o objects/py3_config.o"
-      fi
+      PYTHON3_OBJ="objects/if_python3.o"
 
       dnl On FreeBSD linking with "-pthread" is required to use threads.
       dnl _THREAD_SAFE must be used for compiling then.

diff --git a/src/version.c b/src/version.c
index bf2cec904d0ba2de52c806fc2ba6046bc9ea8d49..15da1d8d72d99d3e11de3c96cb1d2f09a271ec31 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    613,
 /**/
     612,
 /**/