traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make curses.h inclusion conditional as in the original patch #1012280. 

Backported to 2.3.
This commit is contained in:
Martin v. Löwis 2004-09-18 10:07:03 +00:00
parent ae2830c55c
commit 5d52e781d9
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
configure vendored
View File

@ -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 @@ fi
# 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 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <curses.h>
#include <$ac_header>
#ifdef HAVE_CURSES_H
#include <curses.h>
#endif
#include <term.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@ -5416,25 +5416,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
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
echo "$as_me:$LINENO: result: $ac_cv_header_term_h" >&5
echo "${ECHO_T}$ac_cv_header_term_h" >&6
fi
done
# checks for typedefs

6
configure.in
View File

@ -968,7 +968,11 @@ AC_HEADER_DIRENT
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