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
155
156
157
158
159
160
161
162
163
|
--- configure.orig Mon Dec 6 15:49:54 1999
+++ configure Wed Jan 5 23:31:22 2000
@@ -3383,15 +3383,15 @@
fi
- USE_INCLUDED_LIBINTL=yes
+# USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.gmo
INSTOBJEXT=.mo
DATADIRNAME=share
- INTLDEPS='$(top_builddir)/intl/libintl.a'
+ INTLDEPS='-lintl'
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
- nls_cv_header_intl=intl/libintl.h
- nls_cv_header_libgt=intl/libgettext.h
+# nls_cv_header_intl=intl/libintl.h
+# nls_cv_header_libgt=intl/libgettext.h
fi
if test "$XGETTEXT" != ":"; then
@@ -10049,7 +10049,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lslang $LIBS"
+LIBS="-lslang -ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
#line 10055 "configure"
#include "confdefs.h"
@@ -10290,7 +10290,7 @@
#define HAVE_SYSTEM_SLANG 1
EOF
- LSLANG="-lslang"
+ LSLANG="-lslang -ltermcap"
screen_manager="SLang (system-installed library)"
echo "$ac_t""Using system installed SLang library" 1>&6
rm -f slang/slang.h
@@ -10736,13 +10736,13 @@
if $search_ncurses
then
- if test -f /usr/include/ncurses.h
+ if test -f /usr/local/include/ncurses/ncurses.h
then
- echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
- CURSES_LIBS="-lncurses"
- CURSES_INCLUDEDIR=""
+ echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
+ CURSES_LIBS="-L/usr/local/lib -lncurses"
+ CURSES_INCLUDEDIR="-I/usr/local/include/ncurses"
search_ncurses=false
- screen_manager="ncurses on /usr/include"
+ screen_manager="ncurses on /usr/local/include/ncurses"
cat >> confdefs.h <<\EOF
#define HAS_CURSES 1
EOF
@@ -10758,13 +10758,13 @@
if $search_ncurses
then
- if test -f /usr/include/ncurses/ncurses.h
+ if test -f /usr/include/ncurses.h
then
- echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
- CURSES_LIBS="-lncurses"
- CURSES_INCLUDEDIR="-I/usr/include/ncurses"
+ echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
+ CURSES_LIBS="-lncurses -lmytinfo"
+ CURSES_INCLUDEDIR=""
search_ncurses=false
- screen_manager="ncurses on /usr/include/ncurses"
+ screen_manager="ncurses on /usr/include"
cat >> confdefs.h <<\EOF
#define HAS_CURSES 1
EOF
@@ -10780,13 +10780,13 @@
if $search_ncurses
then
- if test -f /usr/local/include/ncurses.h
+ if test -f /usr/include/ncurses/ncurses.h
then
- echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
- CURSES_LIBS="-L/usr/local/lib -lncurses"
- CURSES_INCLUDEDIR="-I/usr/local/include"
+ echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
+ CURSES_LIBS="-lncurses"
+ CURSES_INCLUDEDIR="-I/usr/include/ncurses"
search_ncurses=false
- screen_manager="ncurses on /usr/local"
+ screen_manager="ncurses on /usr/include/ncurses"
cat >> confdefs.h <<\EOF
#define HAS_CURSES 1
EOF
@@ -10802,13 +10802,13 @@
if $search_ncurses
then
- if test -f /usr/local/include/ncurses/ncurses.h
+ if test -f /usr/local/include/ncurses.h
then
- echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
- CURSES_LIBS="-L/usr/local/lib -L/usr/local/lib/ncurses -lncurses"
- CURSES_INCLUDEDIR="-I/usr/local/include/ncurses"
+ echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
+ CURSES_LIBS="-L/usr/local/lib -lncurses"
+ CURSES_INCLUDEDIR="-I/usr/local/include"
search_ncurses=false
- screen_manager="ncurses on /usr/local/include/ncurses"
+ screen_manager="ncurses on /usr/local"
cat >> confdefs.h <<\EOF
#define HAS_CURSES 1
EOF
@@ -10867,6 +10867,8 @@
fi
fi
+CFLAGS="$CFLAGS $CURSES_INCLUDEDIR"
+LIBS="$LIBS $CURSES_LIBS"
if $search_ncurses
then
@@ -11071,7 +11073,7 @@
#define HAVE_SYSTEM_SLANG 1
EOF
- LSLANG="-lslang"
+ LSLANG="-lslang -ltermcap"
screen_manager="SLang (system-installed library)"
echo "$ac_t""Using system installed SLang library" 1>&6
rm -f slang/slang.h
@@ -11688,7 +11690,7 @@
vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR vfs/extfs/ulha
vfs/extfs/uha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
-doc/mc.1 doc/mcedit.1 doc/mcserv.8
+doc/mc.1 doc/mcserv.8
intl/Makefile po/Makefile.in
config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
@@ -11932,7 +11934,7 @@
vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR vfs/extfs/ulha
vfs/extfs/uha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
-doc/mc.1 doc/mcedit.1 doc/mcserv.8
+doc/mc.1 doc/mcserv.8
intl/Makefile po/Makefile.in
"}
@@ -12237,10 +12239,6 @@
*) # Relative path.
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
- esac
echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
# The eval makes quoting arguments work.
|
