diff options
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 65 |
1 files changed, 20 insertions, 45 deletions
diff --git a/configure.in b/configure.in index 124e6d7e6..7b9fdbc1a 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.275 2001/04/12 21:35:53 mouring Exp $ | 1 | # $Id: configure.in,v 1.276 2001/04/16 00:41:46 djm Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -58,12 +58,8 @@ case "$host" in | |||
58 | fi | 58 | fi |
59 | AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)]) | 59 | AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)]) |
60 | AC_DEFINE(BROKEN_GETADDRINFO) | 60 | AC_DEFINE(BROKEN_GETADDRINFO) |
61 | MANTYPE='$(CATMAN)' | ||
62 | mansubdir=cat | ||
63 | dnl AIX handles lastlog as part of its login message | 61 | dnl AIX handles lastlog as part of its login message |
64 | AC_DEFINE(DISABLE_LASTLOG) | 62 | AC_DEFINE(DISABLE_LASTLOG) |
65 | MANTYPE='$(CATMAN)' | ||
66 | mansubdir=cat | ||
67 | ;; | 63 | ;; |
68 | *-*-cygwin*) | 64 | *-*-cygwin*) |
69 | LIBS="$LIBS -lregex /usr/lib/textmode.o" | 65 | LIBS="$LIBS -lregex /usr/lib/textmode.o" |
@@ -74,9 +70,11 @@ case "$host" in | |||
74 | AC_DEFINE(NO_X11_UNIX_SOCKETS) | 70 | AC_DEFINE(NO_X11_UNIX_SOCKETS) |
75 | no_libsocket=1 | 71 | no_libsocket=1 |
76 | no_libnsl=1 | 72 | no_libnsl=1 |
73 | MANTYPE=doc | ||
77 | ;; | 74 | ;; |
78 | *-*-dgux*) | 75 | *-*-dgux*) |
79 | AC_DEFINE(IP_TOS_IS_BROKEN) | 76 | AC_DEFINE(IP_TOS_IS_BROKEN) |
77 | MANTYPE=doc | ||
80 | ;; | 78 | ;; |
81 | *-*-hpux10*) | 79 | *-*-hpux10*) |
82 | if test -z "$GCC"; then | 80 | if test -z "$GCC"; then |
@@ -89,8 +87,6 @@ case "$host" in | |||
89 | AC_DEFINE(DISABLE_UTMP) | 87 | AC_DEFINE(DISABLE_UTMP) |
90 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) | 88 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) |
91 | LIBS="$LIBS -lsec" | 89 | LIBS="$LIBS -lsec" |
92 | MANTYPE='$(CATMAN)' | ||
93 | mansubdir=cat | ||
94 | ;; | 90 | ;; |
95 | *-*-hpux11*) | 91 | *-*-hpux11*) |
96 | CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" | 92 | CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" |
@@ -101,14 +97,11 @@ case "$host" in | |||
101 | AC_DEFINE(DISABLE_UTMP) | 97 | AC_DEFINE(DISABLE_UTMP) |
102 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) | 98 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) |
103 | LIBS="$LIBS -lsec" | 99 | LIBS="$LIBS -lsec" |
104 | MANTYPE='$(CATMAN)' | ||
105 | mansubdir=cat | ||
106 | ;; | 100 | ;; |
107 | *-*-irix5*) | 101 | *-*-irix5*) |
108 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 102 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
109 | LDFLAGS="$LDFLAGS" | 103 | LDFLAGS="$LDFLAGS" |
110 | PATH="$PATH:/usr/etc" | 104 | PATH="$PATH:/usr/etc" |
111 | MANTYPE='$(CATMAN)' | ||
112 | no_libsocket=1 | 105 | no_libsocket=1 |
113 | no_libnsl=1 | 106 | no_libnsl=1 |
114 | AC_DEFINE(BROKEN_INET_NTOA) | 107 | AC_DEFINE(BROKEN_INET_NTOA) |
@@ -117,7 +110,6 @@ case "$host" in | |||
117 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 110 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
118 | LDFLAGS="$LDFLAGS" | 111 | LDFLAGS="$LDFLAGS" |
119 | PATH="$PATH:/usr/etc" | 112 | PATH="$PATH:/usr/etc" |
120 | MANTYPE='$(CATMAN)' | ||
121 | AC_DEFINE(WITH_IRIX_ARRAY) | 113 | AC_DEFINE(WITH_IRIX_ARRAY) |
122 | AC_DEFINE(WITH_IRIX_PROJECT) | 114 | AC_DEFINE(WITH_IRIX_PROJECT) |
123 | AC_DEFINE(WITH_IRIX_AUDIT) | 115 | AC_DEFINE(WITH_IRIX_AUDIT) |
@@ -125,7 +117,6 @@ case "$host" in | |||
125 | no_libsocket=1 | 117 | no_libsocket=1 |
126 | no_libnsl=1 | 118 | no_libnsl=1 |
127 | AC_DEFINE(BROKEN_INET_NTOA) | 119 | AC_DEFINE(BROKEN_INET_NTOA) |
128 | mansubdir=man | ||
129 | ;; | 120 | ;; |
130 | *-*-linux*) | 121 | *-*-linux*) |
131 | no_dev_ptmx=1 | 122 | no_dev_ptmx=1 |
@@ -133,6 +124,7 @@ case "$host" in | |||
133 | AC_DEFINE(DONT_TRY_OTHER_AF) | 124 | AC_DEFINE(DONT_TRY_OTHER_AF) |
134 | AC_DEFINE(PAM_TTY_KLUDGE) | 125 | AC_DEFINE(PAM_TTY_KLUDGE) |
135 | inet6_default_4in6=yes | 126 | inet6_default_4in6=yes |
127 | MANTYPE=doc | ||
136 | ;; | 128 | ;; |
137 | mips-sony-bsd|mips-sony-newsos4) | 129 | mips-sony-bsd|mips-sony-newsos4) |
138 | AC_DEFINE(HAVE_NEWS4) | 130 | AC_DEFINE(HAVE_NEWS4) |
@@ -140,12 +132,15 @@ mips-sony-bsd|mips-sony-newsos4) | |||
140 | AC_CHECK_LIB(iberty, xatexit, AC_DEFINE(HAVE_XATEXIT), | 132 | AC_CHECK_LIB(iberty, xatexit, AC_DEFINE(HAVE_XATEXIT), |
141 | AC_MSG_ERROR([*** libiberty missing - please install first or check config.log ***]) | 133 | AC_MSG_ERROR([*** libiberty missing - please install first or check config.log ***]) |
142 | ) | 134 | ) |
135 | MANTYPE=doc | ||
143 | ;; | 136 | ;; |
144 | *-*-netbsd*) | 137 | *-*-netbsd*) |
145 | need_dash_r=1 | 138 | need_dash_r=1 |
139 | MANTYPE=doc | ||
146 | ;; | 140 | ;; |
147 | *-*-freebsd*) | 141 | *-*-freebsd*) |
148 | check_for_libcrypt_later=1 | 142 | check_for_libcrypt_later=1 |
143 | MANTYPE=doc | ||
149 | ;; | 144 | ;; |
150 | *-next-*) | 145 | *-next-*) |
151 | conf_lastlog_location="/usr/adm/lastlog" | 146 | conf_lastlog_location="/usr/adm/lastlog" |
@@ -158,6 +153,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
158 | AC_DEFINE(BROKEN_SAVED_UIDS) | 153 | AC_DEFINE(BROKEN_SAVED_UIDS) |
159 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 154 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
160 | CFLAGS="$CFLAGS" | 155 | CFLAGS="$CFLAGS" |
156 | MANTYPE=doc | ||
161 | ;; | 157 | ;; |
162 | *-*-solaris*) | 158 | *-*-solaris*) |
163 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 159 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
@@ -185,56 +181,42 @@ mips-sony-bsd|mips-sony-newsos4) | |||
185 | conf_wtmp_location=/var/adm/wtmp | 181 | conf_wtmp_location=/var/adm/wtmp |
186 | conf_lastlog_location=/var/adm/lastlog | 182 | conf_lastlog_location=/var/adm/lastlog |
187 | AC_DEFINE(USE_PIPES) | 183 | AC_DEFINE(USE_PIPES) |
188 | MANTYPE='$(CATMAN)' | ||
189 | mansubdir=cat | ||
190 | ;; | 184 | ;; |
191 | *-ncr-sysv*) | 185 | *-ncr-sysv*) |
192 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 186 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
193 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 187 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
194 | MANTYPE='$(CATMAN)' | ||
195 | mansubdir=cat | ||
196 | LIBS="$LIBS -lc89 -lnsl -lgen -lsocket" | 188 | LIBS="$LIBS -lc89 -lnsl -lgen -lsocket" |
197 | ;; | 189 | ;; |
198 | *-sni-sysv*) | 190 | *-sni-sysv*) |
199 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 191 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
200 | LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/ucblib" | 192 | LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/ucblib" |
201 | MANTYPE='$(CATMAN)' | ||
202 | IPADDR_IN_DISPLAY=yes | 193 | IPADDR_IN_DISPLAY=yes |
203 | AC_DEFINE(USE_PIPES) | 194 | AC_DEFINE(USE_PIPES) |
204 | AC_DEFINE(IP_TOS_IS_BROKEN) | 195 | AC_DEFINE(IP_TOS_IS_BROKEN) |
205 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) | 196 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) |
206 | mansubdir=cat | ||
207 | LIBS="$LIBS -lgen -lnsl -lucb" | 197 | LIBS="$LIBS -lgen -lnsl -lucb" |
208 | ;; | 198 | ;; |
209 | *-*-sysv4.2*) | 199 | *-*-sysv4.2*) |
210 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 200 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
211 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 201 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
212 | MANTYPE='$(CATMAN)' | ||
213 | mansubdir=cat | ||
214 | enable_suid_ssh=no | 202 | enable_suid_ssh=no |
215 | AC_DEFINE(USE_PIPES) | 203 | AC_DEFINE(USE_PIPES) |
216 | ;; | 204 | ;; |
217 | *-*-sysv5*) | 205 | *-*-sysv5*) |
218 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 206 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
219 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 207 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
220 | MANTYPE='$(CATMAN)' | ||
221 | mansubdir=cat | ||
222 | enable_suid_ssh=no | 208 | enable_suid_ssh=no |
223 | AC_DEFINE(USE_PIPES) | 209 | AC_DEFINE(USE_PIPES) |
224 | ;; | 210 | ;; |
225 | *-*-sysv*) | 211 | *-*-sysv*) |
226 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 212 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
227 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 213 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
228 | MANTYPE='$(CATMAN)' | ||
229 | mansubdir=cat | ||
230 | LIBS="$LIBS -lgen -lsocket" | 214 | LIBS="$LIBS -lgen -lsocket" |
231 | ;; | 215 | ;; |
232 | *-*-sco3.2v4*) | 216 | *-*-sco3.2v4*) |
233 | CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include" | 217 | CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include" |
234 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 218 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
235 | MANTYPE='$(CATMAN)' | ||
236 | LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm" | 219 | LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm" |
237 | mansubdir=cat | ||
238 | rsh_path="/usr/bin/rcmd" | 220 | rsh_path="/usr/bin/rcmd" |
239 | RANLIB=true | 221 | RANLIB=true |
240 | no_dev_ptmx=1 | 222 | no_dev_ptmx=1 |
@@ -250,8 +232,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
250 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 232 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
251 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 233 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
252 | LIBS="$LIBS -lprot -lx -ltinfo -lm" | 234 | LIBS="$LIBS -lprot -lx -ltinfo -lm" |
253 | MANTYPE='$(CATMAN)' | ||
254 | mansubdir=cat | ||
255 | no_dev_ptmx=1 | 235 | no_dev_ptmx=1 |
256 | rsh_path="/usr/bin/rcmd" | 236 | rsh_path="/usr/bin/rcmd" |
257 | AC_DEFINE(USE_PIPES) | 237 | AC_DEFINE(USE_PIPES) |
@@ -1426,23 +1406,23 @@ AC_SUBST(INSTALL_SSH_PRNG_CMDS) | |||
1426 | 1406 | ||
1427 | 1407 | ||
1428 | AC_ARG_WITH(catman, | 1408 | AC_ARG_WITH(catman, |
1429 | [ --with-catman=man|cat Install preformatted manpages[no]], | 1409 | [ --with-mantype=man|cat|doc Set man page type], |
1430 | [ | 1410 | [ |
1431 | MANTYPE='$(CATMAN)' | 1411 | case "$withval" in |
1432 | if test x"$withval" != x"yes" ; then | 1412 | man|cat|doc) |
1433 | mansubdir=$withval | 1413 | MANTYPE=$withval |
1434 | else | 1414 | ;; |
1435 | mansubdir=cat | 1415 | *) |
1436 | fi | 1416 | AC_MSG_ERROR(invalid man type: $withval) |
1417 | ;; | ||
1418 | esac | ||
1437 | ], [ | 1419 | ], [ |
1438 | if test -z "$MANTYPE" ; then | 1420 | if test -z "$MANTYPE" ; then |
1439 | MANTYPE='$(TROFFMAN)' | 1421 | MANTYPE=man |
1440 | mansubdir=man | ||
1441 | fi | 1422 | fi |
1442 | ] | 1423 | ] |
1443 | ) | 1424 | ) |
1444 | AC_SUBST(MANTYPE) | 1425 | AC_SUBST(MANTYPE) |
1445 | AC_SUBST(mansubdir) | ||
1446 | 1426 | ||
1447 | # Check whether to enable MD5 passwords | 1427 | # Check whether to enable MD5 passwords |
1448 | MD5_MSG="no" | 1428 | MD5_MSG="no" |
@@ -1897,11 +1877,6 @@ AC_OUTPUT(Makefile openbsd-compat/Makefile ssh_prng_cmds) | |||
1897 | 1877 | ||
1898 | # Print summary of options | 1878 | # Print summary of options |
1899 | 1879 | ||
1900 | if test x$MANTYPE = x'$(CATMAN)' ; then | ||
1901 | MAN_MSG=cat | ||
1902 | else | ||
1903 | MAN_MSG=man | ||
1904 | fi | ||
1905 | if test ! -z "$RANDOM_POOL" ; then | 1880 | if test ! -z "$RANDOM_POOL" ; then |
1906 | RAND_MSG="Device ($RANDOM_POOL)" | 1881 | RAND_MSG="Device ($RANDOM_POOL)" |
1907 | else | 1882 | else |
@@ -1921,7 +1896,7 @@ B=`eval echo ${bindir}` ; B=`eval echo ${B}` | |||
1921 | C=`eval echo ${sbindir}` ; C=`eval echo ${C}` | 1896 | C=`eval echo ${sbindir}` ; C=`eval echo ${C}` |
1922 | D=`eval echo ${sysconfdir}` ; D=`eval echo ${D}` | 1897 | D=`eval echo ${sysconfdir}` ; D=`eval echo ${D}` |
1923 | E=`eval echo ${libexecdir}/ssh-askpass` ; E=`eval echo ${E}` | 1898 | E=`eval echo ${libexecdir}/ssh-askpass` ; E=`eval echo ${E}` |
1924 | F=`eval echo ${mandir}/${mansubdir}X` ; F=`eval echo ${F}` | 1899 | F=`eval echo ${mandir}` ; F=`eval echo ${F}` |
1925 | G=`eval echo ${piddir}` ; G=`eval echo ${G}` | 1900 | G=`eval echo ${piddir}` ; G=`eval echo ${G}` |
1926 | H=`eval echo ${user_path}` ; H=`eval echo ${H}` | 1901 | H=`eval echo ${user_path}` ; H=`eval echo ${H}` |
1927 | 1902 | ||
@@ -1935,7 +1910,7 @@ echo " Manual pages: $F" | |||
1935 | echo " PID file: $G" | 1910 | echo " PID file: $G" |
1936 | echo " sshd default user PATH: $H" | 1911 | echo " sshd default user PATH: $H" |
1937 | echo " Random number collection: $RAND_MSG" | 1912 | echo " Random number collection: $RAND_MSG" |
1938 | echo " Manpage format: $MAN_MSG" | 1913 | echo " Manpage format: $MANTYPE" |
1939 | echo " PAM support: ${PAM_MSG}" | 1914 | echo " PAM support: ${PAM_MSG}" |
1940 | echo " KerberosIV support: $KRB4_MSG" | 1915 | echo " KerberosIV support: $KRB4_MSG" |
1941 | echo " AFS support: $AFS_MSG" | 1916 | echo " AFS support: $AFS_MSG" |