Check-in [e80d51d3ae]
Overview
SHA1:e80d51d3ae2960edd7116ee3f7119ca1df799e86
Date: 2014-12-13 23:16:47
User: rkeene
Comment:Added more checks and made them more accurate
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2014-12-13
23:17
[564fd09fbd] Leaf: CTk 8.0.4001 (user: rkeene, tags: trunk, 8.0.4001)
23:16
[e80d51d3ae] Added more checks and made them more accurate (user: rkeene, tags: trunk)
23:04
[b1a15e5697] CTk 8.0.4000 (user: rkeene, tags: trunk, 8.0.4000)
Changes

Modified configure.ac from [88116b55e0] to [b61315201d].

    18     18   
    19     19   dnl Determine how to link to NCurses
    20     20   AC_SEARCH_LIBS(getch, ncurses curses tinfo,, [
    21     21   	AC_MSG_ERROR([Unable to determine how to link to curses])
    22     22   ])
    23     23   
    24     24   AC_SEARCH_LIBS(curses_version, ncurses curses tinfo)
           25  +AC_SEARCH_LIBS(curs_set, ncurses curses tinfo)
           26  +AC_SEARCH_LIBS(set_term, ncurses curses tinfo)
           27  +AC_SEARCH_LIBS(beep, ncurses curses tinfo)
           28  +AC_SEARCH_LIBS(keypad, ncurses curses tinfo)
           29  +
           30  +AC_CHECK_FUNCS(curs_set set_term beep keypad)
    25     31   
    26     32   dnl Look for appropriate headers
    27     33   AC_HEADER_STDC
    28         -AC_CHECK_HEADERS(ctype.h curses.h errno.h fcntl.h limits.h math.h ncurses.h pwd.h signal.h stddef.h stdio.h stdlib.h string.h sys/file.h sys/select.h sys/stat.h sys/time.h sys/times.h sys/types.h tcl.h unistd.h)
           34  +AC_CHECK_HEADERS(ctype.h curses.h curses/curses.h curses/ncurses.h ncurses/ncurses.h errno.h fcntl.h limits.h math.h ncurses.h pwd.h signal.h stddef.h stdio.h stdlib.h string.h sys/file.h sys/select.h sys/stat.h sys/time.h sys/times.h sys/types.h tcl.h unistd.h)
    29     35   
    30     36   dnl Determine what type of targets to build
    31     37   TARGETS="libctk.${SHOBJEXT}"
    32     38   CFLAGS="${CFLAGS} ${SHOBJFLAGS}"
    33     39   AC_SUBST(TARGETS)
    34     40   
    35     41   dnl Produce output
    36     42   AC_OUTPUT(Makefile pkgIndex.tcl)

Modified ctkDisplay.c from [3bae6f7cbc] to [eaa9e679e2].

    10     10    *
    11     11    * @(#) $Id: ctk.shar,v 1.50 1996/01/15 14:47:16 andrewm Exp andrewm $
    12     12    */
    13     13   
    14     14   #include "tkPort.h"
    15     15   #include "tkInt.h"
    16     16   #include <sys/times.h>
    17         -#ifdef USE_NCURSES_H
    18         -#   include <ncurses.h>
    19         -#else
    20         -#   include <curses.h>
           17  +#ifdef HAVE_CURSES_H
           18  +#  include <curses.h>
           19  +#elif defined(HAVE_CURSES_CURSES_H)
           20  +#  include <curses/curses.h>
           21  +#elif defined(HAVE_CURSES_NCURSES_H)
           22  +#  include <curses/ncurses.h>
           23  +#elif defined(HAVE_NCURSES_NCURSES_H)
           24  +#  include <ncurses/ncurses.h>
    21     25   #endif
    22         -
    23     26   #ifdef CLK_TCK
    24     27   #   define MS_PER_CLOCK	(1000.0/CLK_TCK)
    25     28   #elif defined HZ
    26     29   #   define MS_PER_CLOCK	(1000.0/HZ)
    27     30   #else
    28     31       /*
    29     32        * If all else fails, assume 60 clock ticks per second -

Modified tkBind.c from [2ffc1aa07c] to [899df738ec].

    12     12    * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    13     13    *
    14     14    * @(#) $Id: ctk.shar,v 1.50 1996/01/15 14:47:16 andrewm Exp andrewm $
    15     15    */
    16     16   
    17     17   #include "tkPort.h"
    18     18   #include "tkInt.h"
    19         -#ifdef USE_NCURSES_H
    20         -#   include <ncurses.h>
    21         -#else
    22         -#   include <curses.h>
           19  +#ifdef HAVE_CURSES_H
           20  +#  include <curses.h>
           21  +#elif defined(HAVE_CURSES_CURSES_H)
           22  +#  include <curses/curses.h>
           23  +#elif defined(HAVE_CURSES_NCURSES_H)
           24  +#  include <curses/ncurses.h>
           25  +#elif defined(HAVE_NCURSES_NCURSES_H)
           26  +#  include <ncurses/ncurses.h>
    23     27   #endif
    24     28   
    25     29   /*
    26     30    * The structure below represents a binding table.  A binding table
    27     31    * represents a domain in which event bindings may occur.  It includes
    28     32    * a space of objects relative to which events occur (usually windows,
    29     33    * but not always), a history of recent events in the domain, and