diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2014-04-17 18:13:44 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2014-04-17 18:13:44 (GMT) |
| commit | 1a4f561d7c7d28d82e80d7a1c2e4402f081f6f79 (patch) | |
| tree | 19bb36894210c3b30df7c224afc316c2cbd71185 /configure.ac | |
| parent | 4a173bc4edfbc731f227a84a26eb24b6aef91dd6 (diff) | |
| download | cpython-1a4f561d7c7d28d82e80d7a1c2e4402f081f6f79.zip cpython-1a4f561d7c7d28d82e80d7a1c2e4402f081f6f79.tar.gz cpython-1a4f561d7c7d28d82e80d7a1c2e4402f081f6f79.tar.bz2 | |
- Issue #21285: Refactor and fix curses configure check to always search
in a ncursesw directory.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 25e1dc8..9646b47 100644 --- a/configure.ac +++ b/configure.ac @@ -1546,11 +1546,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 \ @@ -1562,7 +1560,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 @@ -1582,14 +1579,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 @@ -4391,8 +4380,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, |