[Python-checkins] python/dist/src configure, 1.457, 1.458 configure.in, 1.470, 1.471

[loewis at users.sourceforge.net]

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

Modified Files:
	configure configure.in 
Log Message:
Make curses.h inclusion conditional as in the original patch #1012280.
Backported to 2.3.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -d -r1.457 -r1.458
--- configure	18 Sep 2004 09:54:48 -0000	1.457
+++ configure	18 Sep 2004 10:07:02 -0000	1.458
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.469 .
+# From configure.in Revision: 1.470 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.4.
 #
@@ -5375,13 +5375,9 @@
 
 
 # On Solaris, term.h requires curses.h
-
-for ac_header in term.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+echo "$as_me:$LINENO: checking for term.h" >&5
+echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+if test "${ac_cv_header_term_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -5390,9 +5386,13 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+
+#ifdef HAVE_CURSES_H
 #include <curses.h>
+#endif
 
-#include <$ac_header>
+
+#include <term.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -5416,25 +5416,18 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
+  ac_cv_header_term_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_Header=no"
+ac_cv_header_term_h=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
+echo "$as_me:$LINENO: result: $ac_cv_header_term_h" >&5
+echo "${ECHO_T}$ac_cv_header_term_h" >&6
 
-done
 
 
 # checks for typedefs

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -d -r1.470 -r1.471
--- configure.in	18 Sep 2004 09:54:52 -0000	1.470
+++ configure.in	18 Sep 2004 10:07:03 -0000	1.471
@@ -968,7 +968,11 @@
 AC_HEADER_MAJOR
 
 # On Solaris, term.h requires curses.h
-AC_CHECK_HEADERS(term.h,,,[#include <curses.h>])
+AC_CHECK_HEADER(term.h,,,[
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+])
 
 # checks for typedefs
 was_it_defined=no