Patch #1418: Make the AC_REPLACE_FUNCS object files actually work.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 7dfa73820b77b9ece0b55cb0ab20698affa075f7..aac765b0e9e6b33f652359caeaa4c4f05c5f4f5b 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -169,6 +169,8 @@ THREADOBJ=  @THREADOBJ@
 DLINCLDIR=     @DLINCLDIR@
 DYNLOADFILE=   @DYNLOADFILE@
 MACHDEP_OBJS=  @MACHDEP_OBJS@
+LIBOBJDIR=     Python/
+LIBOBJS=       @LIBOBJS@
 UNICODE_OBJS=   @UNICODE_OBJS@
 
 PYTHON=                python$(EXE)
@@ -275,6 +277,7 @@ PYTHON_OBJS=        \
                Python/getopt.o \
                Python/pystrtod.o \
                Python/$(DYNLOADFILE) \
+               $(LIBOBJS) \
                $(MACHDEP_OBJS) \
                $(THREADOBJ)
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 17b78331e8e5be8eab598acadc787a9578a5e633..dfc525610c58ad14ac1bb7e3df3539a885e28d5f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1047,6 +1047,8 @@ Tools/Demos
 Build
 -----
 
+- Patch #1418: Make the AC_REPLACE_FUNCS object files actually work.
+
 - Add a FAST_LOOPS build option that speeds-up looping by trading away
   periodic threadstate and signal checking in tight loops.  By default,
   this option is turned-off.  It should only be enabled in debugged,

diff --git a/Python/hypot.c b/Python/hypot.c
index 755d0c31c8ef93fb4932d153b838bea5b7d63a3d..9d3c0d0bac3722af423a8000731e8d96d2458a5f 100644 (file)
--- a/Python/hypot.c
+++ b/Python/hypot.c
@@ -1,7 +1,6 @@
 /* hypot() replacement */
 
-#include "pyconfig.h"
-#include "pyport.h"
+#include "Python.h"
 
 double hypot(double x, double y)
 {