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

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)
 

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,

Python/hypot.c

@@ -1,7 +1,6 @@
 /* hypot() replacement */
 
-#include "pyconfig.h"
-#include "pyport.h"
+#include "Python.h"
 
 double hypot(double x, double y)
 {