1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
|
From 683388b0fcc8d0cc386e0ab749bcbba7cea18c8f Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 14 Feb 2022 06:26:25 -0700
Subject: [PATCH] configure: try -ltinfo as curses linking flag
---
ac/curses.m4 | 21 +++++++++++++++++++--
bc/configure | 34 +++++++++++++++++++++++++++++++++-
cs/c/configure | 34 +++++++++++++++++++++++++++++++++-
3 files changed, 85 insertions(+), 4 deletions(-)
diff --git a/ac/curses.m4 b/ac/curses.m4
index 25b0f1f99a3..d713c990949 100644
--- a/ac/curses.m4
+++ b/ac/curses.m4
@@ -22,7 +22,7 @@ if test "${skip_curses_check}" = "no" ; then
if test "${enable_curses}" = "no" ; then
if test "${enable_portable}" = "yes" ; then
if test "${curses_portable_link}" != "" ; then
- # Try adding portabel link flags
+ # Try adding portable link flags
ORIG_LIBS="$LIBS"
ORIG_CPPFLAGS="$CPPFLAGS"
ORIG_PREFLAGS="$PREFLAGS"
@@ -62,7 +62,24 @@ if test "${skip_curses_check}" = "no" ; then
LIBS="$ORIG_LIBS"
curses_lib_flag=""
fi
- fi
+ fi
+ if test "${enable_curses}" = "no" ; then
+ # Try adding -lncurses -ltinfo
+ ORIG_LIBS="$LIBS"
+ curses_lib_flag=" -lncurses -ltinfo"
+ LIBS="$LIBS $curses_lib_flag"
+ AC_TRY_LINK(
+ [#include <curses.h>]
+ [#include <term.h>],
+[ int errret; ]
+[ setupterm("", 0, &errret);]
+ return 0;
+ , enable_curses=yes, enable_curses=no)
+ if test "${enable_curses}" = "no" ; then
+ LIBS="$ORIG_LIBS"
+ curses_lib_flag=""
+ fi
+ fi
fi
fi
fi
diff --git a/bc/configure b/bc/configure
index 543fab87411..132d2dedd6c 100755
--- a/bc/configure
+++ b/bc/configure
@@ -5991,7 +5991,7 @@ rm -f core conftest.err conftest.$ac_objext \
if test "${enable_curses}" = "no" ; then
if test "${enable_portable}" = "yes" ; then
if test "${curses_portable_link}" != "" ; then
- # Try adding portabel link flags
+ # Try adding portable link flags
ORIG_LIBS="$LIBS"
ORIG_CPPFLAGS="$CPPFLAGS"
ORIG_PREFLAGS="$PREFLAGS"
@@ -6055,6 +6055,38 @@ if ac_fn_c_try_link "$LINENO"; then :
else
enable_curses=no
fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test "${enable_curses}" = "no" ; then
+ LIBS="$ORIG_LIBS"
+ curses_lib_flag=""
+ fi
+ fi
+ if test "${enable_curses}" = "no" ; then
+ # Try adding -lncurses -ltinfo
+ ORIG_LIBS="$LIBS"
+ curses_lib_flag=" -lncurses -ltinfo"
+ LIBS="$LIBS $curses_lib_flag"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <curses.h>
+ #include <term.h>
+int
+main ()
+{
+ int errret;
+ setupterm("", 0, &errret);
+ return 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ enable_curses=yes
+else
+ enable_curses=no
+fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test "${enable_curses}" = "no" ; then
diff --git a/cs/c/configure b/cs/c/configure
index db2132b7f4d..2ec78292f56 100755
--- a/cs/c/configure
+++ b/cs/c/configure
@@ -5635,7 +5635,7 @@ rm -f core conftest.err conftest.$ac_objext \
if test "${enable_curses}" = "no" ; then
if test "${enable_portable}" = "yes" ; then
if test "${curses_portable_link}" != "" ; then
- # Try adding portabel link flags
+ # Try adding portable link flags
ORIG_LIBS="$LIBS"
ORIG_CPPFLAGS="$CPPFLAGS"
ORIG_PREFLAGS="$PREFLAGS"
@@ -5699,6 +5699,38 @@ if ac_fn_c_try_link "$LINENO"; then :
else
enable_curses=no
fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test "${enable_curses}" = "no" ; then
+ LIBS="$ORIG_LIBS"
+ curses_lib_flag=""
+ fi
+ fi
+ if test "${enable_curses}" = "no" ; then
+ # Try adding -lncurses -ltinfo
+ ORIG_LIBS="$LIBS"
+ curses_lib_flag=" -lncurses -ltinfo"
+ LIBS="$LIBS $curses_lib_flag"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <curses.h>
+ #include <term.h>
+int
+main ()
+{
+ int errret;
+ setupterm("", 0, &errret);
+ return 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ enable_curses=yes
+else
+ enable_curses=no
+fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test "${enable_curses}" = "no" ; then
|
GitWeb