Line
Link Here
|
0 |
-- a/c3270/configure |
0 |
++ b/c3270/configure |
Lines 3747-3759
Link Here
|
3747 |
fi |
3747 |
fi |
3748 |
done |
3748 |
done |
3749 |
|
3749 |
|
3750 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for newterm in -lncursesw" >&5 |
3750 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing newterm" >&5 |
3751 |
$as_echo_n "checking for newterm in -lncursesw... " >&6; } |
3751 |
$as_echo_n "checking for library containing newterm... " >&6; } |
3752 |
if ${ac_cv_lib_ncursesw_newterm+:} false; then : |
3752 |
if ${ac_cv_search_newterm+:} false; then : |
3753 |
$as_echo_n "(cached) " >&6 |
3753 |
$as_echo_n "(cached) " >&6 |
3754 |
else |
3754 |
else |
3755 |
ac_check_lib_save_LIBS=$LIBS |
3755 |
ac_func_search_save_LIBS=$LIBS |
3756 |
LIBS="-lncursesw $LIBS" |
|
|
3757 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3756 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3758 |
/* end confdefs.h. */ |
3757 |
/* end confdefs.h. */ |
3759 |
|
3758 |
|
Lines 3772-3803
Link Here
|
3772 |
return 0; |
3771 |
return 0; |
3773 |
} |
3772 |
} |
3774 |
_ACEOF |
3773 |
_ACEOF |
3775 |
if ac_fn_c_try_link "$LINENO"; then : |
3774 |
for ac_lib in '' ncursesw ncurses curses; do |
3776 |
ac_cv_lib_ncursesw_newterm=yes |
3775 |
if test -z "$ac_lib"; then |
3777 |
else |
3776 |
ac_res="none required" |
3778 |
ac_cv_lib_ncursesw_newterm=no |
3777 |
else |
|
|
3778 |
ac_res=-l$ac_lib |
3779 |
LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
3780 |
fi |
3781 |
if ac_fn_c_try_link "$LINENO"; then : |
3782 |
ac_cv_search_newterm=$ac_res |
3779 |
fi |
3783 |
fi |
3780 |
rm -f core conftest.err conftest.$ac_objext \ |
3784 |
rm -f core conftest.err conftest.$ac_objext \ |
3781 |
conftest$ac_exeext conftest.$ac_ext |
3785 |
conftest$ac_exeext |
3782 |
LIBS=$ac_check_lib_save_LIBS |
3786 |
if ${ac_cv_search_newterm+:} false; then : |
3783 |
fi |
3787 |
break |
3784 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_newterm" >&5 |
3788 |
fi |
3785 |
$as_echo "$ac_cv_lib_ncursesw_newterm" >&6; } |
3789 |
done |
3786 |
if test "x$ac_cv_lib_ncursesw_newterm" = xyes; then : |
3790 |
if ${ac_cv_search_newterm+:} false; then : |
3787 |
cat >>confdefs.h <<_ACEOF |
3791 |
|
3788 |
#define HAVE_LIBNCURSESW 1 |
3792 |
else |
3789 |
_ACEOF |
3793 |
ac_cv_search_newterm=no |
3790 |
|
3794 |
fi |
3791 |
LIBS="-lncursesw $LIBS" |
3795 |
rm conftest.$ac_ext |
3792 |
|
3796 |
LIBS=$ac_func_search_save_LIBS |
3793 |
else |
3797 |
fi |
3794 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for newterm in -lncurses" >&5 |
3798 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_newterm" >&5 |
3795 |
$as_echo_n "checking for newterm in -lncurses... " >&6; } |
3799 |
$as_echo "$ac_cv_search_newterm" >&6; } |
3796 |
if ${ac_cv_lib_ncurses_newterm+:} false; then : |
3800 |
ac_res=$ac_cv_search_newterm |
|
|
3801 |
if test "$ac_res" != no; then : |
3802 |
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" |
3803 |
|
3804 |
else |
3805 |
as_fn_error $? "Can't find libncurses or new-enough libcurses" "$LINENO" 5 |
3806 |
fi |
3807 |
|
3808 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setupterm" >&5 |
3809 |
$as_echo_n "checking for library containing setupterm... " >&6; } |
3810 |
if ${ac_cv_search_setupterm+:} false; then : |
3797 |
$as_echo_n "(cached) " >&6 |
3811 |
$as_echo_n "(cached) " >&6 |
3798 |
else |
3812 |
else |
3799 |
ac_check_lib_save_LIBS=$LIBS |
3813 |
ac_func_search_save_LIBS=$LIBS |
3800 |
LIBS="-lncurses $LIBS" |
|
|
3801 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3814 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3802 |
/* end confdefs.h. */ |
3815 |
/* end confdefs.h. */ |
3803 |
|
3816 |
|
Lines 3807-3889
Link Here
|
3807 |
#ifdef __cplusplus |
3820 |
#ifdef __cplusplus |
3808 |
extern "C" |
3821 |
extern "C" |
3809 |
#endif |
3822 |
#endif |
3810 |
char newterm (); |
3823 |
char setupterm (); |
3811 |
int |
3824 |
int |
3812 |
main () |
3825 |
main () |
3813 |
{ |
3826 |
{ |
3814 |
return newterm (); |
3827 |
return setupterm (); |
3815 |
; |
3828 |
; |
3816 |
return 0; |
3829 |
return 0; |
3817 |
} |
3830 |
} |
3818 |
_ACEOF |
3831 |
_ACEOF |
3819 |
if ac_fn_c_try_link "$LINENO"; then : |
3832 |
for ac_lib in '' tinfow tinfo; do |
3820 |
ac_cv_lib_ncurses_newterm=yes |
3833 |
if test -z "$ac_lib"; then |
3821 |
else |
3834 |
ac_res="none required" |
3822 |
ac_cv_lib_ncurses_newterm=no |
3835 |
else |
|
|
3836 |
ac_res=-l$ac_lib |
3837 |
LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
3838 |
fi |
3839 |
if ac_fn_c_try_link "$LINENO"; then : |
3840 |
ac_cv_search_setupterm=$ac_res |
3823 |
fi |
3841 |
fi |
3824 |
rm -f core conftest.err conftest.$ac_objext \ |
3842 |
rm -f core conftest.err conftest.$ac_objext \ |
3825 |
conftest$ac_exeext conftest.$ac_ext |
3843 |
conftest$ac_exeext |
3826 |
LIBS=$ac_check_lib_save_LIBS |
3844 |
if ${ac_cv_search_setupterm+:} false; then : |
3827 |
fi |
3845 |
break |
3828 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_newterm" >&5 |
3846 |
fi |
3829 |
$as_echo "$ac_cv_lib_ncurses_newterm" >&6; } |
3847 |
done |
3830 |
if test "x$ac_cv_lib_ncurses_newterm" = xyes; then : |
3848 |
if ${ac_cv_search_setupterm+:} false; then : |
3831 |
cat >>confdefs.h <<_ACEOF |
3849 |
|
3832 |
#define HAVE_LIBNCURSES 1 |
3850 |
else |
3833 |
_ACEOF |
3851 |
ac_cv_search_setupterm=no |
3834 |
|
3852 |
fi |
3835 |
LIBS="-lncurses $LIBS" |
3853 |
rm conftest.$ac_ext |
3836 |
|
3854 |
LIBS=$ac_func_search_save_LIBS |
3837 |
else |
3855 |
fi |
3838 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for newterm in -lcurses" >&5 |
3856 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_setupterm" >&5 |
3839 |
$as_echo_n "checking for newterm in -lcurses... " >&6; } |
3857 |
$as_echo "$ac_cv_search_setupterm" >&6; } |
3840 |
if ${ac_cv_lib_curses_newterm+:} false; then : |
3858 |
ac_res=$ac_cv_search_setupterm |
3841 |
$as_echo_n "(cached) " >&6 |
3859 |
if test "$ac_res" != no; then : |
3842 |
else |
3860 |
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" |
3843 |
ac_check_lib_save_LIBS=$LIBS |
3861 |
|
3844 |
LIBS="-lcurses $LIBS" |
3862 |
else |
3845 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3863 |
as_fn_error $? "Can't find terminfo library" "$LINENO" 5 |
3846 |
/* end confdefs.h. */ |
|
|
3847 |
|
3848 |
/* Override any GCC internal prototype to avoid an error. |
3849 |
Use char because int might match the return type of a GCC |
3850 |
builtin and then its argument prototype would still apply. */ |
3851 |
#ifdef __cplusplus |
3852 |
extern "C" |
3853 |
#endif |
3854 |
char newterm (); |
3855 |
int |
3856 |
main () |
3857 |
{ |
3858 |
return newterm (); |
3859 |
; |
3860 |
return 0; |
3861 |
} |
3862 |
_ACEOF |
3863 |
if ac_fn_c_try_link "$LINENO"; then : |
3864 |
ac_cv_lib_curses_newterm=yes |
3865 |
else |
3866 |
ac_cv_lib_curses_newterm=no |
3867 |
fi |
3868 |
rm -f core conftest.err conftest.$ac_objext \ |
3869 |
conftest$ac_exeext conftest.$ac_ext |
3870 |
LIBS=$ac_check_lib_save_LIBS |
3871 |
fi |
3872 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_newterm" >&5 |
3873 |
$as_echo "$ac_cv_lib_curses_newterm" >&6; } |
3874 |
if test "x$ac_cv_lib_curses_newterm" = xyes; then : |
3875 |
cat >>confdefs.h <<_ACEOF |
3876 |
#define HAVE_LIBCURSES 1 |
3877 |
_ACEOF |
3878 |
|
3879 |
LIBS="-lcurses $LIBS" |
3880 |
|
3881 |
else |
3882 |
as_fn_error $? "Can't find libncurses or new-enough libcurses" "$LINENO" 5 |
3883 |
fi |
3884 |
|
3885 |
fi |
3886 |
|
3887 |
fi |
3864 |
fi |
3888 |
|
3865 |
|
3889 |
if test "$with_readline" != no; then |
3866 |
if test "$with_readline" != no; then |
Lines 4146-4159
Link Here
|
4146 |
fi |
4123 |
fi |
4147 |
|
4124 |
|
4148 |
|
4125 |
|
4149 |
if test "$ac_cv_lib_ncursesw_newterm" = yes |
4126 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing wadd_wch" >&5 |
4150 |
then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wadd_wch in -lncursesw" >&5 |
4127 |
$as_echo_n "checking for library containing wadd_wch... " >&6; } |
4151 |
$as_echo_n "checking for wadd_wch in -lncursesw... " >&6; } |
4128 |
if ${ac_cv_search_wadd_wch+:} false; then : |
4152 |
if ${ac_cv_lib_ncursesw_wadd_wch+:} false; then : |
|
|
4153 |
$as_echo_n "(cached) " >&6 |
4129 |
$as_echo_n "(cached) " >&6 |
4154 |
else |
4130 |
else |
4155 |
ac_check_lib_save_LIBS=$LIBS |
4131 |
ac_func_search_save_LIBS=$LIBS |
4156 |
LIBS="-lncursesw $LIBS" |
|
|
4157 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4132 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4158 |
/* end confdefs.h. */ |
4133 |
/* end confdefs.h. */ |
4159 |
|
4134 |
|
Lines 4172-4286
Link Here
|
4172 |
return 0; |
4147 |
return 0; |
4173 |
} |
4148 |
} |
4174 |
_ACEOF |
4149 |
_ACEOF |
4175 |
if ac_fn_c_try_link "$LINENO"; then : |
4150 |
for ac_lib in '' ncursesw ncurses curses; do |
4176 |
ac_cv_lib_ncursesw_wadd_wch=yes |
4151 |
if test -z "$ac_lib"; then |
4177 |
else |
4152 |
ac_res="none required" |
4178 |
ac_cv_lib_ncursesw_wadd_wch=no |
4153 |
else |
|
|
4154 |
ac_res=-l$ac_lib |
4155 |
LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
4156 |
fi |
4157 |
if ac_fn_c_try_link "$LINENO"; then : |
4158 |
ac_cv_search_wadd_wch=$ac_res |
4179 |
fi |
4159 |
fi |
4180 |
rm -f core conftest.err conftest.$ac_objext \ |
4160 |
rm -f core conftest.err conftest.$ac_objext \ |
4181 |
conftest$ac_exeext conftest.$ac_ext |
4161 |
conftest$ac_exeext |
4182 |
LIBS=$ac_check_lib_save_LIBS |
4162 |
if ${ac_cv_search_wadd_wch+:} false; then : |
4183 |
fi |
4163 |
break |
4184 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_wadd_wch" >&5 |
4164 |
fi |
4185 |
$as_echo "$ac_cv_lib_ncursesw_wadd_wch" >&6; } |
4165 |
done |
4186 |
if test "x$ac_cv_lib_ncursesw_wadd_wch" = xyes; then : |
4166 |
if ${ac_cv_search_wadd_wch+:} false; then : |
|
|
4167 |
|
4168 |
else |
4169 |
ac_cv_search_wadd_wch=no |
4170 |
fi |
4171 |
rm conftest.$ac_ext |
4172 |
LIBS=$ac_func_search_save_LIBS |
4173 |
fi |
4174 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_wadd_wch" >&5 |
4175 |
$as_echo "$ac_cv_search_wadd_wch" >&6; } |
4176 |
ac_res=$ac_cv_search_wadd_wch |
4177 |
if test "$ac_res" != no; then : |
4178 |
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" |
4187 |
$as_echo "#define CURSES_WIDE 1" >>confdefs.h |
4179 |
$as_echo "#define CURSES_WIDE 1" >>confdefs.h |
4188 |
|
4180 |
|
4189 |
Cw=1 |
4181 |
Cw=1 |
4190 |
fi |
4182 |
else |
4191 |
|
4183 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Wide curses not found -- c3270 will not be able to support multi-byte character encodings" >&5 |
4192 |
elif test "$ac_cv_lib_ncurses_newterm" = yes |
|
|
4193 |
then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wadd_wch in -lncurses" >&5 |
4194 |
$as_echo_n "checking for wadd_wch in -lncurses... " >&6; } |
4195 |
if ${ac_cv_lib_ncurses_wadd_wch+:} false; then : |
4196 |
$as_echo_n "(cached) " >&6 |
4197 |
else |
4198 |
ac_check_lib_save_LIBS=$LIBS |
4199 |
LIBS="-lncurses $LIBS" |
4200 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4201 |
/* end confdefs.h. */ |
4202 |
|
4203 |
/* Override any GCC internal prototype to avoid an error. |
4204 |
Use char because int might match the return type of a GCC |
4205 |
builtin and then its argument prototype would still apply. */ |
4206 |
#ifdef __cplusplus |
4207 |
extern "C" |
4208 |
#endif |
4209 |
char wadd_wch (); |
4210 |
int |
4211 |
main () |
4212 |
{ |
4213 |
return wadd_wch (); |
4214 |
; |
4215 |
return 0; |
4216 |
} |
4217 |
_ACEOF |
4218 |
if ac_fn_c_try_link "$LINENO"; then : |
4219 |
ac_cv_lib_ncurses_wadd_wch=yes |
4220 |
else |
4221 |
ac_cv_lib_ncurses_wadd_wch=no |
4222 |
fi |
4223 |
rm -f core conftest.err conftest.$ac_objext \ |
4224 |
conftest$ac_exeext conftest.$ac_ext |
4225 |
LIBS=$ac_check_lib_save_LIBS |
4226 |
fi |
4227 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_wadd_wch" >&5 |
4228 |
$as_echo "$ac_cv_lib_ncurses_wadd_wch" >&6; } |
4229 |
if test "x$ac_cv_lib_ncurses_wadd_wch" = xyes; then : |
4230 |
$as_echo "#define CURSES_WIDE 1" >>confdefs.h |
4231 |
|
4232 |
Cw=1 |
4233 |
fi |
4234 |
|
4235 |
elif test "$ac_cv_lib_curses_newterm" = yes |
4236 |
then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wadd_wch in -lcurses" >&5 |
4237 |
$as_echo_n "checking for wadd_wch in -lcurses... " >&6; } |
4238 |
if ${ac_cv_lib_curses_wadd_wch+:} false; then : |
4239 |
$as_echo_n "(cached) " >&6 |
4240 |
else |
4241 |
ac_check_lib_save_LIBS=$LIBS |
4242 |
LIBS="-lcurses $LIBS" |
4243 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4244 |
/* end confdefs.h. */ |
4245 |
|
4246 |
/* Override any GCC internal prototype to avoid an error. |
4247 |
Use char because int might match the return type of a GCC |
4248 |
builtin and then its argument prototype would still apply. */ |
4249 |
#ifdef __cplusplus |
4250 |
extern "C" |
4251 |
#endif |
4252 |
char wadd_wch (); |
4253 |
int |
4254 |
main () |
4255 |
{ |
4256 |
return wadd_wch (); |
4257 |
; |
4258 |
return 0; |
4259 |
} |
4260 |
_ACEOF |
4261 |
if ac_fn_c_try_link "$LINENO"; then : |
4262 |
ac_cv_lib_curses_wadd_wch=yes |
4263 |
else |
4264 |
ac_cv_lib_curses_wadd_wch=no |
4265 |
fi |
4266 |
rm -f core conftest.err conftest.$ac_objext \ |
4267 |
conftest$ac_exeext conftest.$ac_ext |
4268 |
LIBS=$ac_check_lib_save_LIBS |
4269 |
fi |
4270 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_wadd_wch" >&5 |
4271 |
$as_echo "$ac_cv_lib_curses_wadd_wch" >&6; } |
4272 |
if test "x$ac_cv_lib_curses_wadd_wch" = xyes; then : |
4273 |
$as_echo "#define CURSES_WIDE 1" >>confdefs.h |
4274 |
|
4275 |
Cw=1 |
4276 |
fi |
4277 |
|
4278 |
else echo "What??? " |
4279 |
fi |
4280 |
if test "$Cw" != "1" |
4281 |
then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Wide curses not found -- c3270 will not be able to support multi-byte character encodings" >&5 |
4282 |
$as_echo "$as_me: WARNING: Wide curses not found -- c3270 will not be able to support multi-byte character encodings" >&2;} |
4184 |
$as_echo "$as_me: WARNING: Wide curses not found -- c3270 will not be able to support multi-byte character encodings" >&2;} |
4283 |
fi |
4185 |
fi |
|
|
4186 |
|
4284 |
|
4187 |
|
4285 |
|
4188 |
|
4286 |
# Extract the first word of "less", so it can be a program name with args. |
4189 |
# Extract the first word of "less", so it can be a program name with args. |