From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 12 Nov 2007 05:14:05 +0000 (+0000)
Subject: Patch #1418: Make the AC_REPLACE_FUNCS object files actually work.
X-Git-Tag: v2.6a1~1063
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63bf149a264a246f109683d6ac54f84859a89660;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 7dfa73820b77..aac765b0e9e6 100644
--- 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 17b78331e8e5..dfc525610c58 100644
--- 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 755d0c31c8ef..9d3c0d0bac37 100644
--- 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)
 {