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
|
--- configure.orig Sun Apr 11 04:38:29 1999
+++ configure Sun May 9 15:58:08 1999
@@ -3267,15 +3267,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
@@ -10524,13 +10524,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
@@ -10546,13 +10546,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
@@ -10568,13 +10568,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
@@ -10590,13 +10590,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
@@ -10655,6 +10655,8 @@
fi
fi
+CFLAGS="$CFLAGS $CURSES_INCLUDEDIR"
+LIBS="$LIBS $CURSES_LIBS"
if $search_ncurses
then
@@ -11465,7 +11467,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
@@ -11684,7 +11686,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
"}
|
