From c6d936e23f75d6de6c9eb50d5b380d33fb823825 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sun, 7 Jun 2009 20:09:53 +0000
Subject: When _locale became a built-in module it was discovered that
 ``-lintl`` was not added as a build flag as needed. This then led to the
 discovery that OS X framework builds did not have the LIBS var to pick up
 this flag.

Fixes issue #6154. Thanks to Benjamin Peterson, Roumen Petrov, Erick Tryzelaar,
Mark Dickinson, Evan Behar, and Ronald Oussoren for helping.
---
 Makefile.pre.in | 4 ++--
 Misc/NEWS       | 7 +++++++
 configure       | 3 ++-
 configure.in    | 5 +++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 378707a..20483f7 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -463,10 +463,10 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
 			-install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
 			-compatibility_version $(VERSION) \
 			-current_version $(VERSION) \
-			-framework CoreFoundation; \
+			-framework CoreFoundation $(LIBS); \
         else \
 		/usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
-			@LIBTOOL_CRUFT@ -framework CoreFoundation;\
+			@LIBTOOL_CRUFT@ -framework CoreFoundation $(LIBS);\
 	fi
 	$(INSTALL) -d -m $(DIRMODE)  \
 		$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
diff --git a/Misc/NEWS b/Misc/NEWS
index 7673f99..3f2179f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -58,6 +58,13 @@ C-API
   --with-pydebug, and vice-versa.
 
 
+Build
+-----
+
+- Issue #6154: Make sure the intl library is added to LIBS if needed. Also
+  added LIBS to OS X framework builds.
+
+
 What's New in Python 3.1 release candidate 1?
 =============================================
 
diff --git a/configure b/configure
index f834aaf..4b429c3 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 73021 .
+# From configure.in Revision: 73142 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -13892,6 +13892,7 @@ cat >>confdefs.h <<\_ACEOF
 #define WITH_LIBINTL 1
 _ACEOF
 
+        LIBS="-lintl $LIBS"
 fi
 
 
diff --git a/configure.in b/configure.in
index 4e77f11..73472bd 100644
--- a/configure.in
+++ b/configure.in
@@ -1819,8 +1819,9 @@ fi
 
 # check if we need libintl for locale functions
 AC_CHECK_LIB(intl, textdomain,
-	AC_DEFINE(WITH_LIBINTL, 1,
-	[Define to 1 if libintl is needed for locale functions.]))
+	[AC_DEFINE(WITH_LIBINTL, 1,
+	[Define to 1 if libintl is needed for locale functions.])
+        LIBS="-lintl $LIBS"])
 
 # checks for system dependent C++ extensions support
 case "$ac_sys_system" in
-- 
cgit v0.12