diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 84 |
2 files changed, 45 insertions, 43 deletions
@@ -2,6 +2,8 @@ | |||
2 | - (dtucker) [configure.ac] Bug #588, #615: Move other libgen tests to after | 2 | - (dtucker) [configure.ac] Bug #588, #615: Move other libgen tests to after |
3 | the dirname test, to allow a broken dirname to be detected correctly. | 3 | the dirname test, to allow a broken dirname to be detected correctly. |
4 | Based partially on patch supplied by alex.kiernan at thus.net. ok djm@ | 4 | Based partially on patch supplied by alex.kiernan at thus.net. ok djm@ |
5 | - (tim) [configure.ac] Move libgen tests to before libwrap to unbreak | ||
6 | UnixWare 2.03 using --with-tcp-wrappers. | ||
5 | 7 | ||
6 | 20030910 | 8 | 20030910 |
7 | - (dtucker) [configure.ac] Bug #636: Add support for Cray's new X1 machine. | 9 | - (dtucker) [configure.ac] Bug #636: Add support for Cray's new X1 machine. |
@@ -1064,4 +1066,4 @@ | |||
1064 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1066 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1065 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1067 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1066 | 1068 | ||
1067 | $Id: ChangeLog,v 1.2979 2003/09/11 04:42:55 dtucker Exp $ | 1069 | $Id: ChangeLog,v 1.2980 2003/09/12 05:19:31 tim Exp $ |
diff --git a/configure.ac b/configure.ac index d5d6f546d..ad0eedc68 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.150 2003/09/11 04:42:56 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.151 2003/09/12 05:19:31 tim Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -463,6 +463,47 @@ if test "x$with_tcp_wrappers" != "xno" ; then | |||
463 | fi | 463 | fi |
464 | fi | 464 | fi |
465 | 465 | ||
466 | dnl IRIX and Solaris 2.5.1 have dirname() in libgen | ||
467 | AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[ | ||
468 | AC_CHECK_LIB(gen, dirname,[ | ||
469 | AC_CACHE_CHECK([for broken dirname], | ||
470 | ac_cv_have_broken_dirname, [ | ||
471 | save_LIBS="$LIBS" | ||
472 | LIBS="$LIBS -lgen" | ||
473 | AC_TRY_RUN( | ||
474 | [ | ||
475 | #include <libgen.h> | ||
476 | #include <string.h> | ||
477 | |||
478 | int main(int argc, char **argv) { | ||
479 | char *s, buf[32]; | ||
480 | |||
481 | strncpy(buf,"/etc", 32); | ||
482 | s = dirname(buf); | ||
483 | if (!s || strncmp(s, "/", 32) != 0) { | ||
484 | exit(1); | ||
485 | } else { | ||
486 | exit(0); | ||
487 | } | ||
488 | } | ||
489 | ], | ||
490 | [ ac_cv_have_broken_dirname="no" ], | ||
491 | [ ac_cv_have_broken_dirname="yes" ] | ||
492 | ) | ||
493 | LIBS="$save_LIBS" | ||
494 | ]) | ||
495 | if test "x$ac_cv_have_broken_dirname" = "xno" ; then | ||
496 | LIBS="$LIBS -lgen" | ||
497 | AC_DEFINE(HAVE_DIRNAME) | ||
498 | AC_CHECK_HEADERS(libgen.h) | ||
499 | fi | ||
500 | ]) | ||
501 | ]) | ||
502 | |||
503 | AC_CHECK_FUNC(getspnam, , | ||
504 | AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen")) | ||
505 | AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME)) | ||
506 | |||
466 | AC_ARG_WITH(rpath, | 507 | AC_ARG_WITH(rpath, |
467 | [ --without-rpath Disable auto-added -R linker paths], | 508 | [ --without-rpath Disable auto-added -R linker paths], |
468 | [ | 509 | [ |
@@ -685,47 +726,6 @@ AC_CHECK_DECL(tcsendbreak, | |||
685 | [#include <termios.h>] | 726 | [#include <termios.h>] |
686 | ) | 727 | ) |
687 | 728 | ||
688 | dnl IRIX and Solaris 2.5.1 have dirname() in libgen | ||
689 | AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[ | ||
690 | AC_CHECK_LIB(gen, dirname,[ | ||
691 | AC_CACHE_CHECK([for broken dirname], | ||
692 | ac_cv_have_broken_dirname, [ | ||
693 | save_LIBS="$LIBS" | ||
694 | LIBS="$LIBS -lgen" | ||
695 | AC_TRY_RUN( | ||
696 | [ | ||
697 | #include <libgen.h> | ||
698 | #include <string.h> | ||
699 | |||
700 | int main(int argc, char **argv) { | ||
701 | char *s, buf[32]; | ||
702 | |||
703 | strncpy(buf,"/etc", 32); | ||
704 | s = dirname(buf); | ||
705 | if (!s || strncmp(s, "/", 32) != 0) { | ||
706 | exit(1); | ||
707 | } else { | ||
708 | exit(0); | ||
709 | } | ||
710 | } | ||
711 | ], | ||
712 | [ ac_cv_have_broken_dirname="no" ], | ||
713 | [ ac_cv_have_broken_dirname="yes" ] | ||
714 | ) | ||
715 | LIBS="$save_LIBS" | ||
716 | ]) | ||
717 | if test "x$ac_cv_have_broken_dirname" = "xno" ; then | ||
718 | LIBS="$LIBS -lgen" | ||
719 | AC_DEFINE(HAVE_DIRNAME) | ||
720 | AC_CHECK_HEADERS(libgen.h) | ||
721 | fi | ||
722 | ]) | ||
723 | ]) | ||
724 | |||
725 | AC_CHECK_FUNC(getspnam, , | ||
726 | AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen")) | ||
727 | AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME)) | ||
728 | |||
729 | dnl Checks for time functions | 729 | dnl Checks for time functions |
730 | AC_CHECK_FUNCS(gettimeofday time) | 730 | AC_CHECK_FUNCS(gettimeofday time) |
731 | dnl Checks for utmp functions | 731 | dnl Checks for utmp functions |