[Python-checkins] python/dist/src configure,1.406,1.407 configure.in,1.417,1.418 pyconfig.h.in,1.80,1.81 setup.py,1.168,1.169

[loewis@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28534

Modified Files:
	configure configure.in pyconfig.h.in setup.py 
Log Message:
Patch #752671: NetBSD needs to link libintl to _locale.so.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.406
retrieving revision 1.407
diff -C2 -d -r1.406 -r1.407
*** configure	14 Jun 2003 15:20:26 -0000	1.406
--- configure	14 Jun 2003 21:03:05 -0000	1.407
***************
*** 1,4 ****
  #! /bin/sh
! # From configure.in Revision: 1.416 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53 for python 2.3.
--- 1,4 ----
  #! /bin/sh
! # From configure.in Revision: 1.417 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53 for python 2.3.
***************
*** 9931,9934 ****
--- 9931,9998 ----
  					    # posix4 on Solaris 2.6
  					    # pthread (first!) on Linux
+ # check if we need libintl for locale functions
+ echo "$as_me:$LINENO: checking for textdomain in -lintl" >&5
+ echo $ECHO_N "checking for textdomain in -lintl... $ECHO_C" >&6
+ if test "${ac_cv_lib_intl_textdomain+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char textdomain ();
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+      extern "C"
+ #  endif
+    int F77_DUMMY_MAIN() { return 1; }
+ #endif
+ int
+ main ()
+ {
+ textdomain ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_intl_textdomain=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_lib_intl_textdomain=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_textdomain" >&5
+ echo "${ECHO_T}$ac_cv_lib_intl_textdomain" >&6
+ if test $ac_cv_lib_intl_textdomain = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_LIBINTL 1
+ _ACEOF
+ 
+ fi
+ 
  
  # checks for system dependent C++ extensions support

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.417
retrieving revision 1.418
diff -C2 -d -r1.417 -r1.418
*** configure.in	14 Jun 2003 15:20:28 -0000	1.417
--- configure.in	14 Jun 2003 21:03:05 -0000	1.418
***************
*** 1347,1350 ****
--- 1347,1354 ----
  					    # posix4 on Solaris 2.6
  					    # pthread (first!) on Linux
+ # 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.]))
  
  # checks for system dependent C++ extensions support

Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** pyconfig.h.in	23 May 2003 14:35:23 -0000	1.80
--- pyconfig.h.in	14 Jun 2003 21:03:05 -0000	1.81
***************
*** 782,785 ****
--- 782,788 ----
  #undef WITH_DYLD
  
+ /* Define to 1 if libintl is needed for locale functions. */
+ #undef WITH_LIBINTL
+ 
  /* Define if you want to produce an OpenStep/Rhapsody framework (shared
     library plus accessory files). */

Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -d -r1.168 -r1.169
*** setup.py	13 Jun 2003 20:35:11 -0000	1.168
--- setup.py	14 Jun 2003 21:03:05 -0000	1.169
***************
*** 340,344 ****
              exts.append( Extension('unicodedata', ['unicodedata.c']) )
          # access to ISO C locale support
!         if platform in ['cygwin', 'aix4']:
              locale_libs = ['intl']
          else:
--- 340,346 ----
              exts.append( Extension('unicodedata', ['unicodedata.c']) )
          # access to ISO C locale support
!         data = open('pyconfig.h').read()
!         m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
!         if m is not None:
              locale_libs = ['intl']
          else: