[Python-checkins] python/dist/src configure, 1.416.4.15, 1.416.4.16 configure.in, 1.427.4.14, 1.427.4.15 pyconfig.h.in, 1.83.4.5, 1.83.4.6

loewis at users.sourceforge.net loewis at users.sourceforge.net
Sat Sep 18 11:58:48 CEST 2004


Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18977

Modified Files:
      Tag: release23-maint
	configure configure.in pyconfig.h.in 
Log Message:
Patch #1012280: Include curses.h for term.h check. Fixes #933795.
Update to autoconf 2.59.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.416.4.15
retrieving revision 1.416.4.16
diff -u -d -r1.416.4.15 -r1.416.4.16
--- configure	12 Aug 2004 13:44:25 -0000	1.416.4.15
+++ configure	18 Sep 2004 09:58:37 -0000	1.416.4.16
@@ -1,10 +1,9 @@
 #! /bin/sh
-# From configure.in Revision: 1.427.4.13 .
+# From configure.in Revision: 1.427.4.14 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for python 2.3.
+# Generated by GNU Autoconf 2.59 for python 2.3.
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
[...10537 lines suppressed...]
+	 X"$ac_file" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -19972,10 +21895,10 @@
       as_dirs="$as_dir $as_dirs"
       as_dir=`(dirname "$as_dir") 2>/dev/null ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$as_dir" : 'X\(//\)[^/]' \| \
-         X"$as_dir" : 'X\(//\)$' \| \
-         X"$as_dir" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.427.4.14
retrieving revision 1.427.4.15
diff -u -d -r1.427.4.14 -r1.427.4.15
--- configure.in	12 Aug 2004 13:44:44 -0000	1.427.4.14
+++ configure.in	18 Sep 2004 09:58:40 -0000	1.427.4.15
@@ -925,17 +925,20 @@
 
 # checks for header files
 AC_HEADER_STDC
-AC_CHECK_HEADERS(dlfcn.h fcntl.h grp.h limits.h langinfo.h \
+AC_CHECK_HEADERS(curses.h dlfcn.h fcntl.h grp.h limits.h langinfo.h \
 libintl.h locale.h ncurses.h poll.h pthread.h \
 signal.h stdarg.h stddef.h stdlib.h stropts.h termios.h thread.h \
 unistd.h utime.h \
 sys/audioio.h sys/bsdtty.h sys/file.h sys/lock.h sys/mkdev.h sys/modem.h \
 sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \
-sys/un.h sys/utsname.h sys/wait.h pty.h term.h libutil.h \
+sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
 sys/resource.h netpacket/packet.h sysexits.h)
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
 
+# On Solaris, term.h requires curses.h
+AC_CHECK_HEADERS(term.h,,,[#include <curses.h>])
+
 # checks for typedefs
 was_it_defined=no
 AC_MSG_CHECKING(for clock_t in time.h)

Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.83.4.5
retrieving revision 1.83.4.6
diff -u -d -r1.83.4.5 -r1.83.4.6
--- pyconfig.h.in	12 Aug 2004 13:44:44 -0000	1.83.4.5
+++ pyconfig.h.in	18 Sep 2004 09:58:40 -0000	1.83.4.6
@@ -71,6 +71,9 @@
 /* Define if you have the 'ctermid_r' function. */
 #undef HAVE_CTERMID_R
 
+/* Define to 1 if you have the <curses.h> header file. */
+#undef HAVE_CURSES_H
+
 /* Define to 1 if you have the device macros. */
 #undef HAVE_DEVICE_MACROS
 



More information about the Python-checkins mailing list