diff options
author | Damien Miller <djm@mindrot.org> | 2000-09-29 23:01:36 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-09-29 23:01:36 +1100 |
commit | 78315eb6d6bf411b07d9e0bc1ede41fae9484f25 (patch) | |
tree | 6c1ff91e092df4d86b076f7f4917764bb6d17f5e /configure.in | |
parent | cb5e44a440c1b310a9dc5b8b5abe32fe11ed479b (diff) |
- (djm) Merged big SCO portability patch from Tim Rice
<tim@multitalents.net>
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 87 |
1 files changed, 78 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 1c228dd9c..a038c9594 100644 --- a/configure.in +++ b/configure.in | |||
@@ -13,6 +13,7 @@ AC_PATH_PROG(PERL, perl) | |||
13 | AC_SUBST(PERL) | 13 | AC_SUBST(PERL) |
14 | AC_PATH_PROG(ENT, ent) | 14 | AC_PATH_PROG(ENT, ent) |
15 | AC_SUBST(ENT) | 15 | AC_SUBST(ENT) |
16 | AC_PATH_PROGS(FILEPRIV, filepriv, true, /sbin:/usr/sbin) | ||
16 | 17 | ||
17 | # Use LOGIN_PROGRAM from environment if possible | 18 | # Use LOGIN_PROGRAM from environment if possible |
18 | if test ! -z "$LOGIN_PROGRAM" ; then | 19 | if test ! -z "$LOGIN_PROGRAM" ; then |
@@ -36,6 +37,8 @@ if test "$GCC" = "yes"; then | |||
36 | CFLAGS="$CFLAGS -Wall" | 37 | CFLAGS="$CFLAGS -Wall" |
37 | fi | 38 | fi |
38 | 39 | ||
40 | CFLAGS="$CFLAGS -I. -I${srcdir-.}" | ||
41 | |||
39 | # Check for some target-specific stuff | 42 | # Check for some target-specific stuff |
40 | case "$host" in | 43 | case "$host" in |
41 | *-*-aix*) | 44 | *-*-aix*) |
@@ -159,6 +162,22 @@ case "$host" in | |||
159 | mansubdir=cat | 162 | mansubdir=cat |
160 | LIBS="$LIBS -lgen -lnsl -lucb" | 163 | LIBS="$LIBS -lgen -lnsl -lucb" |
161 | ;; | 164 | ;; |
165 | *-*-sysv4.2*) | ||
166 | CFLAGS="$CFLAGS -I/usr/local/include" | ||
167 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
168 | MANTYPE='$(CATMAN)' | ||
169 | mansubdir=cat | ||
170 | LIBS="$LIBS -lgen -lsocket -lnsl -lresolv" | ||
171 | enable_suid_ssh=no | ||
172 | ;; | ||
173 | *-*-sysv5*) | ||
174 | CFLAGS="$CFLAGS -I/usr/local/include" | ||
175 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
176 | MANTYPE='$(CATMAN)' | ||
177 | mansubdir=cat | ||
178 | LIBS="$LIBS -lgen -lsocket" | ||
179 | enable_suid_ssh=no | ||
180 | ;; | ||
162 | *-*-sysv*) | 181 | *-*-sysv*) |
163 | CFLAGS="$CFLAGS -I/usr/local/include" | 182 | CFLAGS="$CFLAGS -I/usr/local/include" |
164 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 183 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
@@ -166,14 +185,28 @@ case "$host" in | |||
166 | mansubdir=cat | 185 | mansubdir=cat |
167 | LIBS="$LIBS -lgen -lsocket" | 186 | LIBS="$LIBS -lgen -lsocket" |
168 | ;; | 187 | ;; |
169 | *-*-sco3*) | 188 | *-*-sco3.2v4*) |
170 | AC_DEFINE(USE_PIPES) | 189 | AC_DEFINE(USE_PIPES) |
190 | CFLAGS="$CFLAGS -Dftruncate=chsize -I/usr/local/include" | ||
191 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
192 | MANTYPE='$(CATMAN)' | ||
193 | mansubdir=cat | ||
194 | LIBS="$LIBS -lgen -lsocket -los -lprot -lx" | ||
195 | no_dev_ptmx=1 | ||
196 | RANLIB=true | ||
197 | AC_DEFINE(BROKEN_SYS_TERMIO_H) | ||
198 | rsh_path="/usr/bin/rcmd" | ||
199 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) | ||
200 | ;; | ||
201 | *-*-sco3.2v5*) | ||
171 | CFLAGS="$CFLAGS -I/usr/local/include" | 202 | CFLAGS="$CFLAGS -I/usr/local/include" |
172 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 203 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
173 | MANTYPE='$(CATMAN)' | 204 | MANTYPE='$(CATMAN)' |
174 | mansubdir=cat | 205 | mansubdir=cat |
175 | LIBS="$LIBS -lgen -lsocket" | 206 | LIBS="$LIBS -lgen -lsocket -lprot -lx" |
176 | no_dev_ptmx=1 | 207 | no_dev_ptmx=1 |
208 | rsh_path="/usr/bin/rcmd" | ||
209 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) | ||
177 | ;; | 210 | ;; |
178 | *-dec-osf*) | 211 | *-dec-osf*) |
179 | # This is untested | 212 | # This is untested |
@@ -230,10 +263,10 @@ if test -z "$no_libnsl" ; then | |||
230 | fi | 263 | fi |
231 | 264 | ||
232 | # Checks for header files. | 265 | # Checks for header files. |
233 | AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h time.h ttyent.h usersec.h util.h utmp.h utmpx.h) | 266 | AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utmp.h utmpx.h) |
234 | 267 | ||
235 | dnl Checks for library functions. | 268 | dnl Checks for library functions. |
236 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo futimes gai_strerror getaddrinfo getnameinfo getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid sigaction sigvec snprintf strerror strlcat strlcpy strsep strtok_r vsnprintf vhangup _getpty __b64_ntop) | 269 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock fchmod freeaddrinfo futimes gai_strerror getaddrinfo getnameinfo getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid setrlimit sigaction sigvec snprintf strerror strlcat strlcpy strsep strtok_r vsnprintf vhangup _getpty __b64_ntop) |
237 | dnl Checks for time functions | 270 | dnl Checks for time functions |
238 | AC_CHECK_FUNCS(gettimeofday time) | 271 | AC_CHECK_FUNCS(gettimeofday time) |
239 | dnl Checks for libutil functions | 272 | dnl Checks for libutil functions |
@@ -615,7 +648,17 @@ AC_CACHE_CHECK([for sa_family_t], ac_cv_have_sa_family_t, [ | |||
615 | ], | 648 | ], |
616 | [ sa_family_t foo; foo = 1235; ], | 649 | [ sa_family_t foo; foo = 1235; ], |
617 | [ ac_cv_have_sa_family_t="yes" ], | 650 | [ ac_cv_have_sa_family_t="yes" ], |
651 | [ AC_TRY_COMPILE( | ||
652 | [ | ||
653 | #include <sys/types.h> | ||
654 | #include <sys/socket.h> | ||
655 | #include <netinet/in.h> | ||
656 | ], | ||
657 | [ sa_family_t foo; foo = 1235; ], | ||
658 | [ ac_cv_have_sa_family_t="yes" ], | ||
659 | |||
618 | [ ac_cv_have_sa_family_t="no" ] | 660 | [ ac_cv_have_sa_family_t="no" ] |
661 | )] | ||
619 | ) | 662 | ) |
620 | ]) | 663 | ]) |
621 | if test "x$ac_cv_have_sa_family_t" = "xyes" ; then | 664 | if test "x$ac_cv_have_sa_family_t" = "xyes" ; then |
@@ -712,9 +755,7 @@ if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then | |||
712 | AC_DEFINE(HAVE_STRUCT_ADDRINFO) | 755 | AC_DEFINE(HAVE_STRUCT_ADDRINFO) |
713 | fi | 756 | fi |
714 | 757 | ||
715 | 758 | dnl Checks for structure members | |
716 | # Checks for structure members | ||
717 | |||
718 | OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmp.h, HAVE_HOST_IN_UTMP) | 759 | OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmp.h, HAVE_HOST_IN_UTMP) |
719 | OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmpx.h, HAVE_HOST_IN_UTMPX) | 760 | OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmpx.h, HAVE_HOST_IN_UTMPX) |
720 | OSSH_CHECK_HEADER_FOR_FIELD(syslen, utmpx.h, HAVE_SYSLEN_IN_UTMPX) | 761 | OSSH_CHECK_HEADER_FOR_FIELD(syslen, utmpx.h, HAVE_SYSLEN_IN_UTMPX) |
@@ -732,6 +773,7 @@ OSSH_CHECK_HEADER_FOR_FIELD(ut_exit, utmp.h, HAVE_EXIT_IN_UTMP) | |||
732 | OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmp.h, HAVE_TIME_IN_UTMP) | 773 | OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmp.h, HAVE_TIME_IN_UTMP) |
733 | OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmpx.h, HAVE_TIME_IN_UTMPX) | 774 | OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmpx.h, HAVE_TIME_IN_UTMPX) |
734 | OSSH_CHECK_HEADER_FOR_FIELD(ut_tv, utmpx.h, HAVE_TV_IN_UTMPX) | 775 | OSSH_CHECK_HEADER_FOR_FIELD(ut_tv, utmpx.h, HAVE_TV_IN_UTMPX) |
776 | AC_STRUCT_ST_BLKSIZE | ||
735 | 777 | ||
736 | AC_CACHE_CHECK([for sun_len field in struct sockaddr_un], | 778 | AC_CACHE_CHECK([for sun_len field in struct sockaddr_un], |
737 | ac_cv_have_sun_len_in_struct_sockaddr_un, [ | 779 | ac_cv_have_sun_len_in_struct_sockaddr_un, [ |
@@ -855,7 +897,7 @@ AC_ARG_WITH(xauth, | |||
855 | fi | 897 | fi |
856 | ], | 898 | ], |
857 | [ | 899 | [ |
858 | AC_PATH_PROG(xauth_path, xauth) | 900 | AC_PATH_PROG(xauth_path, xauth,,$PATH:/usr/X/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/openwin/bin) |
859 | if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then | 901 | if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then |
860 | xauth_path="/usr/openwin/bin/xauth" | 902 | xauth_path="/usr/openwin/bin/xauth" |
861 | fi | 903 | fi |
@@ -1142,7 +1184,7 @@ AC_ARG_WITH(default-path, | |||
1142 | [ --with-default-path=PATH Specify default \$PATH environment for server], | 1184 | [ --with-default-path=PATH Specify default \$PATH environment for server], |
1143 | [ | 1185 | [ |
1144 | if test "x$withval" != "xno" ; then | 1186 | if test "x$withval" != "xno" ; then |
1145 | AC_DEFINE_UNQUOTED(USER_PATH, "$withval") | 1187 | user_path="$withval" |
1146 | SERVER_PATH_MSG="$withval" | 1188 | SERVER_PATH_MSG="$withval" |
1147 | fi | 1189 | fi |
1148 | ] | 1190 | ] |
@@ -1183,6 +1225,25 @@ AC_ARG_WITH(4in6, | |||
1183 | ] | 1225 | ] |
1184 | ) | 1226 | ) |
1185 | 1227 | ||
1228 | AC_MSG_CHECKING(whether to install ssh as suid root) | ||
1229 | AC_ARG_ENABLE(suid-ssh, | ||
1230 | [ --enable-suid-ssh Install ssh as suid root (default) | ||
1231 | --disable-suid-ssh Install ssh without suid bit], | ||
1232 | [ case "$enableval" in | ||
1233 | no) | ||
1234 | AC_MSG_RESULT(no) | ||
1235 | SSHMODE=0711 | ||
1236 | ;; | ||
1237 | *) AC_MSG_RESULT(yes) | ||
1238 | SSHMODE=04711 | ||
1239 | ;; | ||
1240 | esac ], | ||
1241 | AC_MSG_RESULT(yes) | ||
1242 | SSHMODE=04711 | ||
1243 | ) | ||
1244 | AC_SUBST(SSHMODE) | ||
1245 | |||
1246 | |||
1186 | # Where to place sshd.pid | 1247 | # Where to place sshd.pid |
1187 | piddir=/var/run | 1248 | piddir=/var/run |
1188 | AC_ARG_WITH(pid-dir, | 1249 | AC_ARG_WITH(pid-dir, |
@@ -1194,6 +1255,14 @@ AC_ARG_WITH(pid-dir, | |||
1194 | ] | 1255 | ] |
1195 | ) | 1256 | ) |
1196 | 1257 | ||
1258 | # make sure the directory exists | ||
1259 | if test ! -d $piddir ; then | ||
1260 | piddir=`eval echo ${sysconfdir}` | ||
1261 | case $piddir in | ||
1262 | NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;; | ||
1263 | esac | ||
1264 | fi | ||
1265 | |||
1197 | AC_DEFINE_UNQUOTED(PIDDIR, "$piddir") | 1266 | AC_DEFINE_UNQUOTED(PIDDIR, "$piddir") |
1198 | AC_SUBST(piddir) | 1267 | AC_SUBST(piddir) |
1199 | 1268 | ||