- Merge 3.4
This commit is contained in:
doko@ubuntu.com
commit
f8d60ca0c4
|
|
@ -251,6 +251,9 @@ IDLE
|
|||
Build
|
||||
-----
|
||||
|
||||
- Issue #21285: Refactor and fix curses configure check to always search
|
||||
in a ncursesw directory.
|
||||
|
||||
- Issue #15234: For BerkelyDB and Sqlite, only add the found library and
|
||||
include directories if they aren't already being searched. This avoids
|
||||
an explicit runtime library dependency.
|
||||
|
|
|
|||
|
|
@ -7021,11 +7021,9 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
|
|||
|
||||
fi
|
||||
|
||||
ac_save_cppflags="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
|
||||
for ac_header in asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \
|
||||
for ac_header in asm/types.h conio.h direct.h dlfcn.h errno.h \
|
||||
fcntl.h grp.h \
|
||||
ieeefp.h io.h langinfo.h libintl.h ncurses.h process.h pthread.h \
|
||||
ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \
|
||||
sched.h shadow.h signal.h stdint.h stropts.h termios.h \
|
||||
unistd.h utime.h \
|
||||
poll.h sys/devpoll.h sys/epoll.h sys/poll.h \
|
||||
|
|
@ -7049,7 +7047,6 @@ fi
|
|||
|
||||
done
|
||||
|
||||
CPPFLAGS=$ac_save_cppflags
|
||||
ac_header_dirent=no
|
||||
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
|
||||
as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
|
||||
|
|
@ -7286,26 +7283,6 @@ fi
|
|||
done
|
||||
|
||||
|
||||
|
||||
# On Solaris, term.h requires curses.h
|
||||
for ac_header in term.h
|
||||
do :
|
||||
ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" "
|
||||
#ifdef HAVE_CURSES_H
|
||||
#include <curses.h>
|
||||
#endif
|
||||
|
||||
"
|
||||
if test "x$ac_cv_header_term_h" = xyes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_TERM_H 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
|
||||
# On Linux, netlink.h requires asm/types.h
|
||||
for ac_header in linux/netlink.h
|
||||
do :
|
||||
|
|
@ -14761,8 +14738,43 @@ $as_echo "#define HAVE_STAT_TV_NSEC2 1" >>confdefs.h
|
|||
|
||||
fi
|
||||
|
||||
# first curses header check
|
||||
ac_save_cppflags="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
|
||||
|
||||
for ac_header in curses.h ncurses.h
|
||||
do :
|
||||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||||
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
|
||||
# On Solaris, term.h requires curses.h
|
||||
for ac_header in term.h
|
||||
do :
|
||||
ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" "
|
||||
#ifdef HAVE_CURSES_H
|
||||
#include <curses.h>
|
||||
#endif
|
||||
|
||||
"
|
||||
if test "x$ac_cv_header_term_h" = xyes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_TERM_H 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
|
||||
# On HP/UX 11.0, mvwdelch is a block with a return statement
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mvwdelch is an expression" >&5
|
||||
$as_echo_n "checking whether mvwdelch is an expression... " >&6; }
|
||||
|
|
|
|||
26
configure.ac
26
configure.ac
|
|
@ -1555,11 +1555,9 @@ dnl AC_MSG_RESULT($cpp_type)
|
|||
|
||||
# checks for header files
|
||||
AC_HEADER_STDC
|
||||
ac_save_cppflags="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
|
||||
AC_CHECK_HEADERS(asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \
|
||||
AC_CHECK_HEADERS(asm/types.h conio.h direct.h dlfcn.h errno.h \
|
||||
fcntl.h grp.h \
|
||||
ieeefp.h io.h langinfo.h libintl.h ncurses.h process.h pthread.h \
|
||||
ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \
|
||||
sched.h shadow.h signal.h stdint.h stropts.h termios.h \
|
||||
unistd.h utime.h \
|
||||
poll.h sys/devpoll.h sys/epoll.h sys/poll.h \
|
||||
|
|
@ -1571,7 +1569,6 @@ sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \
|
|||
libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
|
||||
bluetooth/bluetooth.h linux/tipc.h spawn.h util.h alloca.h endian.h \
|
||||
sys/endian.h)
|
||||
CPPFLAGS=$ac_save_cppflags
|
||||
AC_HEADER_DIRENT
|
||||
AC_HEADER_MAJOR
|
||||
|
||||
|
|
@ -1591,14 +1588,6 @@ AC_CHECK_HEADERS([net/if.h], [], [],
|
|||
#endif
|
||||
])
|
||||
|
||||
|
||||
# On Solaris, term.h requires curses.h
|
||||
AC_CHECK_HEADERS(term.h,,,[
|
||||
#ifdef HAVE_CURSES_H
|
||||
#include <curses.h>
|
||||
#endif
|
||||
])
|
||||
|
||||
# On Linux, netlink.h requires asm/types.h
|
||||
AC_CHECK_HEADERS(linux/netlink.h,,,[
|
||||
#ifdef HAVE_ASM_TYPES_H
|
||||
|
|
@ -4413,8 +4402,19 @@ then
|
|||
[Define if you have struct stat.st_mtimensec])
|
||||
fi
|
||||
|
||||
# first curses header check
|
||||
ac_save_cppflags="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
|
||||
|
||||
AC_CHECK_HEADERS(curses.h ncurses.h)
|
||||
|
||||
# On Solaris, term.h requires curses.h
|
||||
AC_CHECK_HEADERS(term.h,,,[
|
||||
#ifdef HAVE_CURSES_H
|
||||
#include <curses.h>
|
||||
#endif
|
||||
])
|
||||
|
||||
# On HP/UX 11.0, mvwdelch is a block with a return statement
|
||||
AC_MSG_CHECKING(whether mvwdelch is an expression)
|
||||
AC_CACHE_VAL(ac_cv_mvwdelch_is_expression,
|
||||
|
|
|
|||
Loading…
Reference in New Issue