]>
Commit | Line | Data |
---|---|---|
8771b7c0 JB |
1 | --- firebird-1.5.1.4500/src/extern/editline/configure.in.orig 2004-05-23 20:24:25.000000000 +0200 |
2 | +++ firebird-1.5.1.4500/src/extern/editline/configure.in 2004-08-08 02:29:06.390960872 +0200 | |
3 | @@ -8,7 +8,11 @@ | |
4 | CFLAGS=$CFLAGS | |
5 | AC_PROG_CC | |
6 | if test "x$CFLAGS" = "x" ; then | |
7 | - no_CFLAGS="yes" | |
8 | + if test "x$OPTFLAGS" != "x"; then | |
9 | + CFLAGS="$OPTFLAGS" | |
10 | + else | |
11 | + no_CFLAGS="yes" | |
12 | + fi | |
13 | fi | |
14 | if test "x$no_CFLAGS" = "xyes" -a "x$GCC" = "xyes" ; then | |
15 | CFLAGS="-Wall -pipe -g3" | |
16 | @@ -18,6 +22,7 @@ | |
17 | S_CFLAGS="-fPIC -DPIC" | |
18 | AC_SUBST(S_CFLAGS) | |
19 | AC_PROG_CPP | |
20 | +AC_PROG_EGREP | |
21 | dnl Must do this now, otherwise it is only done for NetBSD (see 'case' below) | |
22 | ||
23 | dnl Platform-specific settings. The ABI can probably be determined | |
24 | @@ -63,22 +68,25 @@ | |
25 | AC_PROG_RANLIB | |
26 | AC_PATH_PROG(AR, ar, , $PATH) | |
27 | ||
28 | -dnl Search for termcap access routines in termcap, tinfo, curses, and ncurses. | |
29 | -AC_CHECK_LIB(termcap, tgetent, , \ | |
30 | - AC_CHECK_LIB(tinfo, tgetent, , \ | |
31 | - AC_CHECK_LIB(curses, tgetent, , \ | |
32 | - AC_CHECK_LIB(ncurses, tgetent, , \ | |
33 | - AC_MSG_ERROR(termcap support not found))))) | |
34 | - | |
35 | -dnl Use termcap.h if it exists; otherwise we need both term.h and [n]curses.h. | |
36 | -AC_CHECK_HEADERS(termcap.h, , \ | |
37 | - AC_CHECK_HEADERS(term.h, , \ | |
38 | - AC_MSG_RESULT(Need term.h since termcap.h is missing)) | |
39 | - AC_CHECK_HEADERS(curses.h, , \ | |
40 | - AC_CHECK_HEADERS(ncurses.h, , \ | |
41 | - AC_MSG_RESULT(Need curses.h or ncurses.h)))) | |
42 | +if test -d /usr/include/ncurses; then | |
43 | + CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" | |
44 | +fi | |
45 | +dnl Search for termcap access routines in tinfo, curses, and ncurses, termcap. | |
46 | +AC_CHECK_LIB(tinfo, tgetent, ,[ | |
47 | + AC_CHECK_LIB(curses, tgetent, ,[ | |
48 | + AC_CHECK_LIB(ncurses, tgetent, ,[ | |
49 | + AC_CHECK_LIB(termcap, tgetent, ,[ | |
50 | + AC_MSG_ERROR(termcap support not found)])])])]) | |
51 | + | |
52 | +dnl Use term.h (and [n]curses.h) if it exists; otherwise use termcap.h | |
53 | +AC_CHECK_HEADERS(term.h,[ | |
54 | + AC_CHECK_HEADERS(curses.h, ,[ | |
55 | + AC_CHECK_HEADERS(ncurses.h, ,[ | |
56 | + AC_MSG_RESULT(Need curses.h or ncurses.h)])])],[ | |
57 | + AC_CHECK_HEADERS(termcap.h, ,[ | |
58 | + AC_MSG_RESULT(Need termcap.h since term.h is missing)])]) | |
59 | ||
60 | -AC_CHECK_HEADERS(sys/cdefs.h vis.h alloca.h) | |
61 | +AC_CHECK_HEADERS(sys/cdefs.h alloca.h) | |
62 | ||
63 | AC_CHECK_FUNCS(issetugid) | |
64 | AC_CHECK_FUNCS(strlcat, , CCSRCS="$CCSRCS np/strlcat.c") | |
65 | @@ -87,6 +95,10 @@ | |
66 | AC_CHECK_FUNCS(strvis, , CCSRCS="$CCSRCS np/vis.c") | |
67 | AC_CHECK_FUNCS(strunvis, , CCSRCS="$CCSRCS np/unvis.c") | |
68 | ||
69 | +if test "$ac_cv_func_strvis" = "yes" && test "$ac_cv_func_strunvis" = "yes" ; then | |
70 | + AC_CHECK_HEADERS(vis.h) | |
71 | +fi | |
72 | + | |
73 | AC_EGREP_CPP(yes, | |
74 | [#include <sys/cdefs.h> | |
75 | #ifdef __RCSID | |
76 | @@ -135,7 +147,7 @@ | |
77 | if test "x$enable_debug" = "xyes" ; then | |
78 | CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG" | |
79 | CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE" | |
80 | -else | |
81 | +elif test "x$no_CFLAGS" = "xyes"; then | |
82 | CFLAGS="$CFLAGS -O" | |
83 | fi | |
84 | ||
85 | --- firebird-1.5.1.4500/src/extern/editline/term.c.orig 2004-05-23 20:24:25.000000000 +0200 | |
86 | +++ firebird-1.5.1.4500/src/extern/editline/term.c 2004-08-08 02:49:13.258489120 +0200 | |
87 | @@ -63,6 +63,7 @@ | |
88 | /* Solaris's term.h does horrid things. */ | |
89 | #if (defined(HAVE_TERM_H) && !defined(SUNOS)) | |
90 | #include <term.h> | |
91 | +#undef key_clear | |
92 | #endif | |
93 | #include <sys/types.h> | |
94 | #include <sys/ioctl.h> |