diff options
author | Tim Rice <tim@multitalents.net> | 2001-11-03 11:09:32 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2001-11-03 11:09:32 -0800 |
commit | e589a299a1c1cf26035cddf3996107500242ba1d (patch) | |
tree | 9023b8d5300eab10dde2718cd03db0f7620ac536 /configure.ac | |
parent | 14a5c99b5c84ab86b34baf4b9e8f454118164815 (diff) |
[ contrib/caldera/openssh.spec contrib/caldera/sshd.init]
Updates from Raymund Will <ray@caldera.de>
[acconfig.h configure.in] Clean up login checks.
Problem reported by Jim Knoble <jmknoble@pobox.com>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 39654a270..e1844eb56 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.3 2001/10/27 17:45:37 tim Exp $ | 1 | # $Id: configure.ac,v 1.4 2001/11/03 19:09:33 tim Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -370,9 +370,6 @@ fi | |||
370 | 370 | ||
371 | AC_CHECK_FUNC(getspnam, , | 371 | AC_CHECK_FUNC(getspnam, , |
372 | AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen")) | 372 | AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen")) |
373 | AC_CHECK_FUNC(login, , | ||
374 | AC_CHECK_LIB(util, login, | ||
375 | AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil")) | ||
376 | 373 | ||
377 | dnl zlib is required | 374 | dnl zlib is required |
378 | AC_ARG_WITH(zlib, | 375 | AC_ARG_WITH(zlib, |
@@ -426,6 +423,11 @@ AC_CHECK_FUNC(utimes, | |||
426 | [], [ AC_CHECK_LIB(c89, utimes, LIBS="$LIBS -lc89") ] | 423 | [], [ AC_CHECK_LIB(c89, utimes, LIBS="$LIBS -lc89") ] |
427 | ) | 424 | ) |
428 | 425 | ||
426 | dnl Checks for libutil functions | ||
427 | AC_CHECK_HEADERS(libutil.h) | ||
428 | AC_SEARCH_LIBS(login, util bsd, [AC_DEFINE(HAVE_LOGIN)]) | ||
429 | AC_CHECK_FUNCS(logout updwtmp logwtmp) | ||
430 | |||
429 | AC_FUNC_STRFTIME | 431 | AC_FUNC_STRFTIME |
430 | 432 | ||
431 | # Checks for header files. | 433 | # Checks for header files. |
@@ -617,9 +619,6 @@ int main(int argc, char **argv) { | |||
617 | 619 | ||
618 | dnl Checks for time functions | 620 | dnl Checks for time functions |
619 | AC_CHECK_FUNCS(gettimeofday time) | 621 | AC_CHECK_FUNCS(gettimeofday time) |
620 | dnl Checks for libutil functions | ||
621 | AC_CHECK_HEADERS(libutil.h) | ||
622 | AC_CHECK_FUNCS(login logout updwtmp logwtmp) | ||
623 | dnl Checks for utmp functions | 622 | dnl Checks for utmp functions |
624 | AC_CHECK_FUNCS(endutent getutent getutid getutline pututline setutent) | 623 | AC_CHECK_FUNCS(endutent getutent getutid getutline pututline setutent) |
625 | AC_CHECK_FUNCS(utmpname) | 624 | AC_CHECK_FUNCS(utmpname) |
@@ -632,11 +631,6 @@ AC_CHECK_FUNC(getuserattr, | |||
632 | [AC_CHECK_LIB(s, getuserattr, [LIBS="$LIBS -ls"; AC_DEFINE(HAVE_GETUSERATTR)])] | 631 | [AC_CHECK_LIB(s, getuserattr, [LIBS="$LIBS -ls"; AC_DEFINE(HAVE_GETUSERATTR)])] |
633 | ) | 632 | ) |
634 | 633 | ||
635 | AC_CHECK_FUNC(login, | ||
636 | [AC_DEFINE(HAVE_LOGIN)], | ||
637 | [AC_CHECK_LIB(bsd, login, [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_LOGIN)])] | ||
638 | ) | ||
639 | |||
640 | AC_CHECK_FUNC(daemon, | 634 | AC_CHECK_FUNC(daemon, |
641 | [AC_DEFINE(HAVE_DAEMON)], | 635 | [AC_DEFINE(HAVE_DAEMON)], |
642 | [AC_CHECK_LIB(bsd, daemon, [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_DAEMON)])] | 636 | [AC_CHECK_LIB(bsd, daemon, [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_DAEMON)])] |