diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index fcf7e416b..b33914dae 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.409 2008/07/09 11:07:19 djm Exp $ | 1 | # $Id: configure.ac,v 1.415 2009/02/16 04:37:03 djm Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.409 $) | 18 | AC_REVISION($Revision: 1.415 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -126,7 +126,7 @@ int main(void){char b[10]; memset(b, 0, sizeof(b));} | |||
126 | 126 | ||
127 | # -fstack-protector-all doesn't always work for some GCC versions | 127 | # -fstack-protector-all doesn't always work for some GCC versions |
128 | # and/or platforms, so we test if we can. If it's not supported | 128 | # and/or platforms, so we test if we can. If it's not supported |
129 | # on a give platform gcc will emit a warning so we use -Werror. | 129 | # on a given platform gcc will emit a warning so we use -Werror. |
130 | if test "x$use_stack_protector" = "x1"; then | 130 | if test "x$use_stack_protector" = "x1"; then |
131 | for t in -fstack-protector-all -fstack-protector; do | 131 | for t in -fstack-protector-all -fstack-protector; do |
132 | AC_MSG_CHECKING(if $CC supports $t) | 132 | AC_MSG_CHECKING(if $CC supports $t) |
@@ -136,8 +136,8 @@ int main(void){char b[10]; memset(b, 0, sizeof(b));} | |||
136 | LDFLAGS="$LDFLAGS $t -Werror" | 136 | LDFLAGS="$LDFLAGS $t -Werror" |
137 | AC_LINK_IFELSE( | 137 | AC_LINK_IFELSE( |
138 | [AC_LANG_SOURCE([ | 138 | [AC_LANG_SOURCE([ |
139 | #include <stdlib.h> | 139 | #include <stdio.h> |
140 | int main(void){return 0;} | 140 | int main(void){char x[[256]]; snprintf(x, sizeof(x), "XXX"); return 0;} |
141 | ])], | 141 | ])], |
142 | [ AC_MSG_RESULT(yes) | 142 | [ AC_MSG_RESULT(yes) |
143 | CFLAGS="$saved_CFLAGS $t" | 143 | CFLAGS="$saved_CFLAGS $t" |
@@ -145,8 +145,8 @@ int main(void){return 0;} | |||
145 | AC_MSG_CHECKING(if $t works) | 145 | AC_MSG_CHECKING(if $t works) |
146 | AC_RUN_IFELSE( | 146 | AC_RUN_IFELSE( |
147 | [AC_LANG_SOURCE([ | 147 | [AC_LANG_SOURCE([ |
148 | #include <stdlib.h> | 148 | #include <stdio.h> |
149 | int main(void){exit(0);} | 149 | int main(void){char x[[256]]; snprintf(x, sizeof(x), "XXX"); return 0;} |
150 | ])], | 150 | ])], |
151 | [ AC_MSG_RESULT(yes) | 151 | [ AC_MSG_RESULT(yes) |
152 | break ], | 152 | break ], |
@@ -477,6 +477,8 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
477 | AC_CHECK_DECL(AU_IPv4, [], | 477 | AC_CHECK_DECL(AU_IPv4, [], |
478 | AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records]) | 478 | AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records]) |
479 | [#include <bsm/audit.h>] | 479 | [#include <bsm/audit.h>] |
480 | AC_DEFINE(LASTLOG_WRITE_PUTUTXLINE, 1, | ||
481 | [Define if pututxline updates lastlog too]) | ||
480 | ) | 482 | ) |
481 | ;; | 483 | ;; |
482 | *-*-dragonfly*) | 484 | *-*-dragonfly*) |
@@ -561,6 +563,14 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
561 | AC_DEFINE(WITH_ABBREV_NO_TTY) | 563 | AC_DEFINE(WITH_ABBREV_NO_TTY) |
562 | AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") | 564 | AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") |
563 | ;; | 565 | ;; |
566 | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) | ||
567 | check_for_libcrypt_later=1 | ||
568 | AC_DEFINE(PAM_TTY_KLUDGE) | ||
569 | AC_DEFINE(LOCKED_PASSWD_PREFIX, "!") | ||
570 | AC_DEFINE(SPT_TYPE,SPT_REUSEARGV) | ||
571 | AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts]) | ||
572 | AC_DEFINE(USE_BTMP, 1, [Use btmp to log bad logins]) | ||
573 | ;; | ||
564 | *-*-linux*) | 574 | *-*-linux*) |
565 | no_dev_ptmx=1 | 575 | no_dev_ptmx=1 |
566 | check_for_libcrypt_later=1 | 576 | check_for_libcrypt_later=1 |
@@ -728,7 +738,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
728 | ;; | 738 | ;; |
729 | # UnixWare 7.x, OpenUNIX 8 | 739 | # UnixWare 7.x, OpenUNIX 8 |
730 | *-*-sysv5*) | 740 | *-*-sysv5*) |
731 | check_for_libcrypt_later=1 | ||
732 | AC_DEFINE(UNIXWARE_LONG_PASSWORDS, 1, [Support passwords > 8 chars]) | 741 | AC_DEFINE(UNIXWARE_LONG_PASSWORDS, 1, [Support passwords > 8 chars]) |
733 | AC_DEFINE(USE_PIPES) | 742 | AC_DEFINE(USE_PIPES) |
734 | AC_DEFINE(SETEUID_BREAKS_SETUID) | 743 | AC_DEFINE(SETEUID_BREAKS_SETUID) |
@@ -741,8 +750,14 @@ mips-sony-bsd|mips-sony-newsos4) | |||
741 | AC_DEFINE(BROKEN_LIBIAF, 1, | 750 | AC_DEFINE(BROKEN_LIBIAF, 1, |
742 | [ia_uinfo routines not supported by OS yet]) | 751 | [ia_uinfo routines not supported by OS yet]) |
743 | AC_DEFINE(BROKEN_UPDWTMPX) | 752 | AC_DEFINE(BROKEN_UPDWTMPX) |
753 | AC_CHECK_LIB(prot, getluid,[ LIBS="$LIBS -lprot" | ||
754 | AC_CHECK_FUNCS(getluid setluid,,,-lprot) | ||
755 | AC_DEFINE(HAVE_SECUREWARE) | ||
756 | AC_DEFINE(DISABLE_SHADOW) | ||
757 | ],,) | ||
744 | ;; | 758 | ;; |
745 | *) AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") | 759 | *) AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") |
760 | check_for_libcrypt_later=1 | ||
746 | ;; | 761 | ;; |
747 | esac | 762 | esac |
748 | ;; | 763 | ;; |
@@ -1503,6 +1518,8 @@ AC_CHECK_FUNCS(utmpname) | |||
1503 | dnl Checks for utmpx functions | 1518 | dnl Checks for utmpx functions |
1504 | AC_CHECK_FUNCS(endutxent getutxent getutxid getutxline pututxline ) | 1519 | AC_CHECK_FUNCS(endutxent getutxent getutxid getutxline pututxline ) |
1505 | AC_CHECK_FUNCS(setutxent utmpxname) | 1520 | AC_CHECK_FUNCS(setutxent utmpxname) |
1521 | dnl Checks for lastlog functions | ||
1522 | AC_CHECK_FUNCS(getlastlogxbyname) | ||
1506 | 1523 | ||
1507 | AC_CHECK_FUNC(daemon, | 1524 | AC_CHECK_FUNC(daemon, |
1508 | [AC_DEFINE(HAVE_DAEMON, 1, [Define if your libraries define daemon()])], | 1525 | [AC_DEFINE(HAVE_DAEMON, 1, [Define if your libraries define daemon()])], |
@@ -2824,6 +2841,15 @@ AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [ | |||
2824 | if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then | 2841 | if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then |
2825 | AC_DEFINE(HAVE_STRUCT_IN6_ADDR, 1, | 2842 | AC_DEFINE(HAVE_STRUCT_IN6_ADDR, 1, |
2826 | [define if you have struct in6_addr data type]) | 2843 | [define if you have struct in6_addr data type]) |
2844 | |||
2845 | dnl Now check for sin6_scope_id | ||
2846 | AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, | ||
2847 | [ | ||
2848 | #ifdef HAVE_SYS_TYPES_H | ||
2849 | #include <sys/types.h> | ||
2850 | #endif | ||
2851 | #include <netinet/in.h> | ||
2852 | ]) | ||
2827 | fi | 2853 | fi |
2828 | 2854 | ||
2829 | AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [ | 2855 | AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [ |