Commit | Line | Data |
---|---|---|
257e5f01 FF |
1 | diff -u -r ../expect5.45/configure.in ./configure.in |
2 | --- ../expect5.45/configure.in 2010-08-27 17:51:53.000000000 -0400 | |
3 | +++ ./configure.in 2016-04-18 00:23:36.618635535 -0400 | |
4 | @@ -347,11 +347,7 @@ | |
5 | fi | |
6 | ||
7 | AC_MSG_CHECKING([stty to use]) | |
8 | -if test -r /usr/local/bin/stty ; then | |
9 | - STTY_BIN=/usr/local/bin/stty | |
10 | -else | |
11 | - STTY_BIN=/bin/stty | |
12 | -fi | |
13 | +STTY_BIN=@TERMUX_PREFIX@/bin/applets/stty | |
14 | AC_MSG_RESULT($STTY_BIN) | |
15 | ||
16 | AC_MSG_CHECKING([if stty reads stdout]) | |
17 | @@ -481,7 +477,7 @@ | |
18 | , | |
19 | AC_MSG_RESULT(no) | |
20 | , | |
21 | - AC_MSG_ERROR([Expect can't be cross compiled]) | |
22 | + AC_MSG_RESULT(no) | |
23 | ) | |
24 | ||
25 | AC_MSG_CHECKING([if any value exists for WNOHANG]) | |
26 | @@ -506,7 +502,8 @@ | |
27 | AC_MSG_RESULT(no) | |
28 | AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) | |
29 | , | |
30 | - AC_MSG_ERROR([Expect can't be cross compiled]) | |
31 | + AC_MSG_RESULT(yes) | |
32 | + AC_DEFINE_UNQUOTED(WNOHANG_BACKUP_VALUE, 1) | |
33 | ) | |
34 | ||
35 | # | |
36 | @@ -574,7 +571,8 @@ | |
37 | AC_DEFINE(REARM_SIG) | |
38 | , | |
39 | AC_MSG_RESULT(no) | |
40 | -, AC_MSG_WARN([Expect can't be cross compiled]) | |
41 | +, | |
42 | + AC_MSG_RESULT(no) | |
43 | ) | |
44 | ||
45 | # HPUX7 has trouble with the big cat so split it | |
46 | @@ -725,7 +723,7 @@ | |
47 | , | |
48 | AC_MSG_RESULT(no) | |
49 | , | |
50 | - AC_MSG_ERROR([Expect can't be cross compiled]) | |
51 | + AC_MSG_RESULT(no) | |
52 | ) | |
53 | ||
54 | # mach systems have include files for unimplemented features | |
55 | @@ -749,7 +747,7 @@ | |
56 | , | |
57 | AC_MSG_RESULT(no) | |
58 | , | |
59 | - AC_MSG_ERROR([Expect can't be cross compiled]) | |
60 | + AC_MSG_RESULT(no) | |
61 | ) | |
62 | ||
63 | # now check for the new style ttys (not yet posix) | |
64 | @@ -771,7 +769,9 @@ | |
65 | , | |
66 | AC_MSG_RESULT(no) | |
67 | , | |
68 | - AC_MSG_ERROR([Expect can't be cross compiled]) | |
69 | + AC_DEFINE(HAVE_TERMIOS) | |
70 | + PTY_TYPE=termios | |
71 | + AC_MSG_RESULT(yes) | |
72 | ) | |
73 | fi | |
74 | ||
75 | @@ -794,7 +794,8 @@ | |
76 | , | |
77 | AC_MSG_RESULT(no) | |
78 | , | |
79 | - AC_MSG_ERROR([Expect can't be cross compiled]) | |
80 | + AC_DEFINE(HAVE_TCGETS_OR_TCGETA_IN_TERMIOS_H) | |
81 | + AC_MSG_RESULT(yes) | |
82 | ) | |
83 | ||
84 | AC_MSG_CHECKING([if TIOCGWINSZ in termios.h]) | |
85 | @@ -816,7 +817,8 @@ | |
86 | , | |
87 | AC_MSG_RESULT(no) | |
88 | , | |
89 | - AC_MSG_ERROR([Expect can't be cross compiled]) | |
90 | + AC_DEFINE(HAVE_TIOCGWINSZ_IN_TERMIOS_H) | |
91 | + AC_MSG_RESULT(yes) | |
92 | ) | |
93 | ||
94 | # finally check for Cray style ttys | |
95 | @@ -837,7 +839,7 @@ | |
96 | , | |
97 | AC_MSG_RESULT(no) | |
98 | , | |
99 | - AC_MSG_ERROR([Expect can't be cross compiled]) | |
100 | + AC_MSG_RESULT(no) | |
101 | ) | |
102 | ||
103 | # | |
104 | @@ -869,7 +871,9 @@ | |
105 | AC_HAVE_FUNCS(getpty) | |
106 | ||
107 | # following test sets SETPGRP_VOID if setpgrp takes 0 args, else takes 2 | |
108 | -AC_FUNC_SETPGRP | |
109 | +cat >>confdefs.h <<\_ACEOF | |
110 | +#define SETPGRP_VOID 1 | |
111 | +_ACEOF | |
112 | ||
113 | # | |
114 | # check for timezones | |
115 | @@ -889,7 +893,7 @@ | |
116 | AC_MSG_RESULT(yes), | |
117 | AC_MSG_RESULT(no) | |
118 | , | |
119 | - AC_MSG_ERROR([Expect can't be cross compiled]) | |
120 | + AC_MSG_RESULT(no) | |
121 | ) | |
122 | ||
123 |