diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-01 02:05:26 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-01 02:05:26 +0000 |
commit | 6d5a72bc1d98a42ba42f082e50a22e911c1d82d3 (patch) | |
tree | 1bf23174bdb6fc71e2846dda0eca195a418484e7 /configure.ac | |
parent | 2ee26b431f98cf1dc0e4fb9809ad1e0c879b8c08 (diff) | |
parent | 58657d96514cd6f16d82add8d6f4adbb36765758 (diff) |
Debian release 3.5p1-1.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 216 |
1 files changed, 140 insertions, 76 deletions
diff --git a/configure.ac b/configure.ac index ad5d5cde9..5fe50e56b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.72 2002/06/25 22:35:16 tim Exp $ | 1 | # $Id: configure.ac,v 1.89 2002/09/26 00:38:47 tim Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -17,7 +17,6 @@ AC_PATH_PROGS(PERL, perl5 perl) | |||
17 | AC_SUBST(PERL) | 17 | AC_SUBST(PERL) |
18 | AC_PATH_PROG(ENT, ent) | 18 | AC_PATH_PROG(ENT, ent) |
19 | AC_SUBST(ENT) | 19 | AC_SUBST(ENT) |
20 | AC_PATH_PROGS(FILEPRIV, filepriv, true, /sbin:/usr/sbin) | ||
21 | AC_PATH_PROG(TEST_MINUS_S_SH, bash) | 20 | AC_PATH_PROG(TEST_MINUS_S_SH, bash) |
22 | AC_PATH_PROG(TEST_MINUS_S_SH, ksh) | 21 | AC_PATH_PROG(TEST_MINUS_S_SH, ksh) |
23 | AC_PATH_PROG(TEST_MINUS_S_SH, sh) | 22 | AC_PATH_PROG(TEST_MINUS_S_SH, sh) |
@@ -71,7 +70,12 @@ case "$host" in | |||
71 | ) | 70 | ) |
72 | LDFLAGS="$saved_LDFLAGS" | 71 | LDFLAGS="$saved_LDFLAGS" |
73 | fi | 72 | fi |
74 | AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)]) | 73 | AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)], |
74 | [AC_CHECK_LIB(s,authenticate, | ||
75 | [ AC_DEFINE(WITH_AIXAUTHENTICATE) | ||
76 | LIBS="$LIBS -ls" | ||
77 | ]) | ||
78 | ]) | ||
75 | AC_DEFINE(BROKEN_GETADDRINFO) | 79 | AC_DEFINE(BROKEN_GETADDRINFO) |
76 | AC_DEFINE(BROKEN_REALPATH) | 80 | AC_DEFINE(BROKEN_REALPATH) |
77 | dnl AIX handles lastlog as part of its login message | 81 | dnl AIX handles lastlog as part of its login message |
@@ -86,14 +90,24 @@ case "$host" in | |||
86 | AC_DEFINE(IPV4_DEFAULT) | 90 | AC_DEFINE(IPV4_DEFAULT) |
87 | AC_DEFINE(IP_TOS_IS_BROKEN) | 91 | AC_DEFINE(IP_TOS_IS_BROKEN) |
88 | AC_DEFINE(NO_X11_UNIX_SOCKETS) | 92 | AC_DEFINE(NO_X11_UNIX_SOCKETS) |
89 | AC_DEFINE(BROKEN_FD_PASSING) | 93 | AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT) |
94 | AC_DEFINE(DISABLE_FD_PASSING) | ||
90 | AC_DEFINE(SETGROUPS_NOOP) | 95 | AC_DEFINE(SETGROUPS_NOOP) |
91 | ;; | 96 | ;; |
92 | *-*-dgux*) | 97 | *-*-dgux*) |
93 | AC_DEFINE(IP_TOS_IS_BROKEN) | 98 | AC_DEFINE(IP_TOS_IS_BROKEN) |
94 | ;; | 99 | ;; |
95 | *-*-darwin*) | 100 | *-*-darwin*) |
96 | AC_DEFINE(BROKEN_GETADDRINFO) | 101 | AC_MSG_CHECKING(if we have working getaddrinfo) |
102 | AC_TRY_RUN([#include <mach-o/dyld.h> | ||
103 | main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | ||
104 | exit(0); | ||
105 | else | ||
106 | exit(1); | ||
107 | }], [AC_MSG_RESULT(working)], | ||
108 | [AC_MSG_RESULT(buggy) | ||
109 | AC_DEFINE(BROKEN_GETADDRINFO)], | ||
110 | [AC_MSG_RESULT(assume it is working)]) | ||
97 | ;; | 111 | ;; |
98 | *-*-hpux10.26) | 112 | *-*-hpux10.26) |
99 | if test -z "$GCC"; then | 113 | if test -z "$GCC"; then |
@@ -108,7 +122,8 @@ case "$host" in | |||
108 | AC_DEFINE(DISABLE_SHADOW) | 122 | AC_DEFINE(DISABLE_SHADOW) |
109 | AC_DEFINE(DISABLE_UTMP) | 123 | AC_DEFINE(DISABLE_UTMP) |
110 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) | 124 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) |
111 | LIBS="$LIBS -lxnet -lsec -lsecpw" | 125 | LIBS="$LIBS -lsec -lsecpw" |
126 | AC_CHECK_LIB(xnet, t_error, ,AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***])) | ||
112 | disable_ptmx_check=yes | 127 | disable_ptmx_check=yes |
113 | ;; | 128 | ;; |
114 | *-*-hpux10*) | 129 | *-*-hpux10*) |
@@ -123,7 +138,8 @@ case "$host" in | |||
123 | AC_DEFINE(DISABLE_SHADOW) | 138 | AC_DEFINE(DISABLE_SHADOW) |
124 | AC_DEFINE(DISABLE_UTMP) | 139 | AC_DEFINE(DISABLE_UTMP) |
125 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) | 140 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) |
126 | LIBS="$LIBS -lxnet -lsec" | 141 | LIBS="$LIBS -lsec" |
142 | AC_CHECK_LIB(xnet, t_error, ,AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***])) | ||
127 | ;; | 143 | ;; |
128 | *-*-hpux11*) | 144 | *-*-hpux11*) |
129 | CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" | 145 | CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" |
@@ -135,7 +151,8 @@ case "$host" in | |||
135 | AC_DEFINE(DISABLE_SHADOW) | 151 | AC_DEFINE(DISABLE_SHADOW) |
136 | AC_DEFINE(DISABLE_UTMP) | 152 | AC_DEFINE(DISABLE_UTMP) |
137 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) | 153 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) |
138 | LIBS="$LIBS -lxnet -lsec" | 154 | LIBS="$LIBS -lsec" |
155 | AC_CHECK_LIB(xnet, t_error, ,AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***])) | ||
139 | ;; | 156 | ;; |
140 | *-*-irix5*) | 157 | *-*-irix5*) |
141 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 158 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
@@ -167,6 +184,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
167 | SONY=1 | 184 | SONY=1 |
168 | ;; | 185 | ;; |
169 | *-*-netbsd*) | 186 | *-*-netbsd*) |
187 | check_for_libcrypt_before=1 | ||
170 | need_dash_r=1 | 188 | need_dash_r=1 |
171 | ;; | 189 | ;; |
172 | *-*-freebsd*) | 190 | *-*-freebsd*) |
@@ -267,17 +285,28 @@ mips-sony-bsd|mips-sony-newsos4) | |||
267 | AC_DEFINE(USE_PIPES) | 285 | AC_DEFINE(USE_PIPES) |
268 | AC_DEFINE(HAVE_SECUREWARE) | 286 | AC_DEFINE(HAVE_SECUREWARE) |
269 | AC_DEFINE(DISABLE_SHADOW) | 287 | AC_DEFINE(DISABLE_SHADOW) |
270 | AC_DEFINE(BROKEN_FD_PASSING) | 288 | AC_DEFINE(DISABLE_FD_PASSING) |
271 | AC_CHECK_FUNCS(getluid setluid) | 289 | AC_CHECK_FUNCS(getluid setluid) |
272 | MANTYPE=man | 290 | MANTYPE=man |
273 | ;; | 291 | ;; |
292 | *-*-unicosmk*) | ||
293 | no_libsocket=1 | ||
294 | no_libnsl=1 | ||
295 | AC_DEFINE(USE_PIPES) | ||
296 | AC_DEFINE(DISABLE_FD_PASSING) | ||
297 | LDFLAGS="$LDFLAGS" | ||
298 | LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm" | ||
299 | MANTYPE=cat | ||
300 | ;; | ||
274 | *-*-unicos*) | 301 | *-*-unicos*) |
275 | no_libsocket=1 | 302 | no_libsocket=1 |
276 | no_libnsl=1 | 303 | no_libnsl=1 |
277 | AC_DEFINE(USE_PIPES) | 304 | AC_DEFINE(USE_PIPES) |
278 | AC_DEFINE(BROKEN_FD_PASSING) | 305 | AC_DEFINE(DISABLE_FD_PASSING) |
279 | LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib" | 306 | AC_DEFINE(NO_SSH_LASTLOG) |
280 | LIBS="$LIBS -lgen -lrsc" | 307 | LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal" |
308 | LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm" | ||
309 | MANTYPE=cat | ||
281 | ;; | 310 | ;; |
282 | *-dec-osf*) | 311 | *-dec-osf*) |
283 | AC_MSG_CHECKING(for Digital Unix SIA) | 312 | AC_MSG_CHECKING(for Digital Unix SIA) |
@@ -348,14 +377,14 @@ AC_ARG_WITH(libs, | |||
348 | 377 | ||
349 | # Checks for header files. | 378 | # Checks for header files. |
350 | AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ | 379 | AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ |
351 | getopt.h glob.h lastlog.h limits.h login.h \ | 380 | getopt.h glob.h ia.h lastlog.h limits.h login.h \ |
352 | login_cap.h maillock.h netdb.h netgroup.h \ | 381 | login_cap.h maillock.h netdb.h netgroup.h \ |
353 | netinet/in_systm.h paths.h pty.h readpassphrase.h \ | 382 | netinet/in_systm.h paths.h pty.h readpassphrase.h \ |
354 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ | 383 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ |
355 | strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ | 384 | strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ |
356 | sys/mman.h sys/select.h sys/stat.h \ | 385 | sys/mman.h sys/select.h sys/stat.h \ |
357 | sys/stropts.h sys/sysmacros.h sys/time.h \ | 386 | sys/stropts.h sys/sysmacros.h sys/time.h \ |
358 | sys/un.h time.h ttyent.h usersec.h \ | 387 | sys/un.h time.h tmpdir.h ttyent.h usersec.h \ |
359 | util.h utime.h utmp.h utmpx.h) | 388 | util.h utime.h utmp.h utmpx.h) |
360 | 389 | ||
361 | # Checks for libraries. | 390 | # Checks for libraries. |
@@ -419,7 +448,8 @@ AC_CHECK_FUNC(strcasecmp, | |||
419 | [], [ AC_CHECK_LIB(resolv, strcasecmp, LIBS="$LIBS -lresolv") ] | 448 | [], [ AC_CHECK_LIB(resolv, strcasecmp, LIBS="$LIBS -lresolv") ] |
420 | ) | 449 | ) |
421 | AC_CHECK_FUNC(utimes, | 450 | AC_CHECK_FUNC(utimes, |
422 | [], [ AC_CHECK_LIB(c89, utimes, LIBS="$LIBS -lc89") ] | 451 | [], [ AC_CHECK_LIB(c89, utimes, [AC_DEFINE(HAVE_UTIMES) |
452 | LIBS="$LIBS -lc89"]) ] | ||
423 | ) | 453 | ) |
424 | 454 | ||
425 | dnl Checks for libutil functions | 455 | dnl Checks for libutil functions |
@@ -468,7 +498,7 @@ AC_TRY_RUN( | |||
468 | [ | 498 | [ |
469 | #include <sys/types.h> | 499 | #include <sys/types.h> |
470 | #include <dirent.h> | 500 | #include <dirent.h> |
471 | int main(void){struct dirent d;return(sizeof(d.d_name)<=sizeof(char));} | 501 | int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));} |
472 | ], | 502 | ], |
473 | [AC_MSG_RESULT(yes)], | 503 | [AC_MSG_RESULT(yes)], |
474 | [ | 504 | [ |
@@ -499,7 +529,7 @@ AC_ARG_WITH(skey, | |||
499 | [ | 529 | [ |
500 | #include <stdio.h> | 530 | #include <stdio.h> |
501 | #include <skey.h> | 531 | #include <skey.h> |
502 | int main() { char *ff = skey_keyinfo(""); ff=""; return 0; } | 532 | int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); } |
503 | ], | 533 | ], |
504 | [AC_MSG_RESULT(yes)], | 534 | [AC_MSG_RESULT(yes)], |
505 | [ | 535 | [ |
@@ -567,7 +597,7 @@ AC_ARG_WITH(tcp-wrappers, | |||
567 | dnl Checks for library functions. | 597 | dnl Checks for library functions. |
568 | AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \ | 598 | AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \ |
569 | clock fchmod fchown freeaddrinfo futimes gai_strerror \ | 599 | clock fchmod fchown freeaddrinfo futimes gai_strerror \ |
570 | getaddrinfo getcwd getgrouplist getnameinfo getopt \ | 600 | getaddrinfo getcwd getgrouplist getnameinfo getopt getpeereid\ |
571 | getrlimit getrusage getttyent glob inet_aton inet_ntoa \ | 601 | getrlimit getrusage getttyent glob inet_aton inet_ntoa \ |
572 | inet_ntop innetgr login_getcapbool md5_crypt memmove \ | 602 | inet_ntop innetgr login_getcapbool md5_crypt memmove \ |
573 | mkdtemp mmap ngetaddrinfo openpty ogetaddrinfo readpassphrase \ | 603 | mkdtemp mmap ngetaddrinfo openpty ogetaddrinfo readpassphrase \ |
@@ -577,30 +607,6 @@ AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \ | |||
577 | socketpair strerror strlcat strlcpy strmode strsep sysconf tcgetpgrp \ | 607 | socketpair strerror strlcat strlcpy strmode strsep sysconf tcgetpgrp \ |
578 | truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty) | 608 | truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty) |
579 | 609 | ||
580 | if test $ac_cv_func_mmap = yes ; then | ||
581 | AC_MSG_CHECKING([for mmap anon shared]) | ||
582 | AC_TRY_RUN( | ||
583 | [ | ||
584 | #include <stdio.h> | ||
585 | #include <sys/mman.h> | ||
586 | #if !defined(MAP_ANON) && defined(MAP_ANONYMOUS) | ||
587 | #define MAP_ANON MAP_ANONYMOUS | ||
588 | #endif | ||
589 | main() { char *p; | ||
590 | p = (char *) mmap(NULL, 10, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED, -1, 0); | ||
591 | if (p == (char *)-1) | ||
592 | exit(1); | ||
593 | exit(0); | ||
594 | } | ||
595 | ], | ||
596 | [ | ||
597 | AC_MSG_RESULT(yes) | ||
598 | AC_DEFINE(HAVE_MMAP_ANON_SHARED) | ||
599 | ], | ||
600 | [ AC_MSG_RESULT(no) ] | ||
601 | ) | ||
602 | fi | ||
603 | |||
604 | dnl IRIX and Solaris 2.5.1 have dirname() in libgen | 610 | dnl IRIX and Solaris 2.5.1 have dirname() in libgen |
605 | AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[ | 611 | AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[ |
606 | AC_CHECK_LIB(gen, dirname,[ | 612 | AC_CHECK_LIB(gen, dirname,[ |
@@ -663,7 +669,7 @@ if test "x$ac_cv_func_snprintf" = "xyes" ; then | |||
663 | AC_TRY_RUN( | 669 | AC_TRY_RUN( |
664 | [ | 670 | [ |
665 | #include <stdio.h> | 671 | #include <stdio.h> |
666 | int main(void){char b[5];snprintf(b,5,"123456789");return(b[4]!='\0');} | 672 | int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');} |
667 | ], | 673 | ], |
668 | [AC_MSG_RESULT(yes)], | 674 | [AC_MSG_RESULT(yes)], |
669 | [ | 675 | [ |
@@ -723,6 +729,12 @@ if test "x$PAM_MSG" = "xyes" ; then | |||
723 | ) | 729 | ) |
724 | fi | 730 | fi |
725 | 731 | ||
732 | # Some systems want crypt() from libcrypt, *not* the version in OpenSSL, | ||
733 | # because the system crypt() is more featureful. | ||
734 | if test "x$check_for_libcrypt_before" = "x1"; then | ||
735 | AC_CHECK_LIB(crypt, crypt) | ||
736 | fi | ||
737 | |||
726 | # Search for OpenSSL | 738 | # Search for OpenSSL |
727 | saved_CPPFLAGS="$CPPFLAGS" | 739 | saved_CPPFLAGS="$CPPFLAGS" |
728 | saved_LDFLAGS="$LDFLAGS" | 740 | saved_LDFLAGS="$LDFLAGS" |
@@ -769,6 +781,70 @@ AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL), | |||
769 | ] | 781 | ] |
770 | ) | 782 | ) |
771 | 783 | ||
784 | # Determine OpenSSL header version | ||
785 | AC_MSG_CHECKING([OpenSSL header version]) | ||
786 | AC_TRY_RUN( | ||
787 | [ | ||
788 | #include <stdio.h> | ||
789 | #include <string.h> | ||
790 | #include <openssl/opensslv.h> | ||
791 | #define DATA "conftest.sslincver" | ||
792 | int main(void) { | ||
793 | FILE *fd; | ||
794 | int rc; | ||
795 | |||
796 | fd = fopen(DATA,"w"); | ||
797 | if(fd == NULL) | ||
798 | exit(1); | ||
799 | |||
800 | if ((rc = fprintf(fd ,"%x (%s)\n", OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0) | ||
801 | exit(1); | ||
802 | |||
803 | exit(0); | ||
804 | } | ||
805 | ], | ||
806 | [ | ||
807 | ssl_header_ver=`cat conftest.sslincver` | ||
808 | AC_MSG_RESULT($ssl_header_ver) | ||
809 | ], | ||
810 | [ | ||
811 | AC_MSG_RESULT(not found) | ||
812 | AC_MSG_ERROR(OpenSSL version header not found.) | ||
813 | ] | ||
814 | ) | ||
815 | |||
816 | # Determine OpenSSL library version | ||
817 | AC_MSG_CHECKING([OpenSSL library version]) | ||
818 | AC_TRY_RUN( | ||
819 | [ | ||
820 | #include <stdio.h> | ||
821 | #include <string.h> | ||
822 | #include <openssl/opensslv.h> | ||
823 | #include <openssl/crypto.h> | ||
824 | #define DATA "conftest.ssllibver" | ||
825 | int main(void) { | ||
826 | FILE *fd; | ||
827 | int rc; | ||
828 | |||
829 | fd = fopen(DATA,"w"); | ||
830 | if(fd == NULL) | ||
831 | exit(1); | ||
832 | |||
833 | if ((rc = fprintf(fd ,"%x (%s)\n", SSLeay(), SSLeay_version(SSLEAY_VERSION))) <0) | ||
834 | exit(1); | ||
835 | |||
836 | exit(0); | ||
837 | } | ||
838 | ], | ||
839 | [ | ||
840 | ssl_library_ver=`cat conftest.ssllibver` | ||
841 | AC_MSG_RESULT($ssl_library_ver) | ||
842 | ], | ||
843 | [ | ||
844 | AC_MSG_RESULT(not found) | ||
845 | AC_MSG_ERROR(OpenSSL library not found.) | ||
846 | ] | ||
847 | ) | ||
772 | 848 | ||
773 | # Sanity check OpenSSL headers | 849 | # Sanity check OpenSSL headers |
774 | AC_MSG_CHECKING([whether OpenSSL's headers match the library]) | 850 | AC_MSG_CHECKING([whether OpenSSL's headers match the library]) |
@@ -776,7 +852,7 @@ AC_TRY_RUN( | |||
776 | [ | 852 | [ |
777 | #include <string.h> | 853 | #include <string.h> |
778 | #include <openssl/opensslv.h> | 854 | #include <openssl/opensslv.h> |
779 | int main(void) { return(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); } | 855 | int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); } |
780 | ], | 856 | ], |
781 | [ | 857 | [ |
782 | AC_MSG_RESULT(yes) | 858 | AC_MSG_RESULT(yes) |
@@ -802,7 +878,7 @@ AC_TRY_RUN( | |||
802 | [ | 878 | [ |
803 | #include <string.h> | 879 | #include <string.h> |
804 | #include <openssl/rand.h> | 880 | #include <openssl/rand.h> |
805 | int main(void) { return(RAND_status() == 1 ? 0 : 1); } | 881 | int main(void) { exit(RAND_status() == 1 ? 0 : 1); } |
806 | ], | 882 | ], |
807 | [ | 883 | [ |
808 | OPENSSL_SEEDS_ITSELF=yes | 884 | OPENSSL_SEEDS_ITSELF=yes |
@@ -1056,7 +1132,16 @@ fi | |||
1056 | 1132 | ||
1057 | AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [ | 1133 | AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [ |
1058 | AC_TRY_COMPILE( | 1134 | AC_TRY_COMPILE( |
1059 | [ #include <sys/types.h> ], | 1135 | [ |
1136 | #include <sys/types.h> | ||
1137 | #ifdef HAVE_STDINT_H | ||
1138 | # include <stdint.h> | ||
1139 | #endif | ||
1140 | #include <sys/socket.h> | ||
1141 | #ifdef HAVE_SYS_BITYPES_H | ||
1142 | # include <sys/bitypes.h> | ||
1143 | #endif | ||
1144 | ], | ||
1060 | [ int64_t a; a = 1;], | 1145 | [ int64_t a; a = 1;], |
1061 | [ ac_cv_have_int64_t="yes" ], | 1146 | [ ac_cv_have_int64_t="yes" ], |
1062 | [ ac_cv_have_int64_t="no" ] | 1147 | [ ac_cv_have_int64_t="no" ] |
@@ -1064,33 +1149,6 @@ AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [ | |||
1064 | ]) | 1149 | ]) |
1065 | if test "x$ac_cv_have_int64_t" = "xyes" ; then | 1150 | if test "x$ac_cv_have_int64_t" = "xyes" ; then |
1066 | AC_DEFINE(HAVE_INT64_T) | 1151 | AC_DEFINE(HAVE_INT64_T) |
1067 | have_int64_t=1 | ||
1068 | fi | ||
1069 | |||
1070 | if test -z "$have_int64_t" ; then | ||
1071 | AC_MSG_CHECKING([for int64_t type in sys/socket.h]) | ||
1072 | AC_TRY_COMPILE( | ||
1073 | [ #include <sys/socket.h> ], | ||
1074 | [ int64_t a; a = 1], | ||
1075 | [ | ||
1076 | AC_DEFINE(HAVE_INT64_T) | ||
1077 | AC_MSG_RESULT(yes) | ||
1078 | ], | ||
1079 | [ AC_MSG_RESULT(no) ] | ||
1080 | ) | ||
1081 | fi | ||
1082 | |||
1083 | if test -z "$have_int64_t" ; then | ||
1084 | AC_MSG_CHECKING([for int64_t type in sys/bitypes.h]) | ||
1085 | AC_TRY_COMPILE( | ||
1086 | [ #include <sys/bitypes.h> ], | ||
1087 | [ int64_t a; a = 1], | ||
1088 | [ | ||
1089 | AC_DEFINE(HAVE_INT64_T) | ||
1090 | AC_MSG_RESULT(yes) | ||
1091 | ], | ||
1092 | [ AC_MSG_RESULT(no) ] | ||
1093 | ) | ||
1094 | fi | 1152 | fi |
1095 | 1153 | ||
1096 | AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [ | 1154 | AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [ |
@@ -1819,7 +1877,7 @@ LIBS="$LIBS $KLIBS $K5LIBS" | |||
1819 | 1877 | ||
1820 | PRIVSEP_PATH=/var/empty | 1878 | PRIVSEP_PATH=/var/empty |
1821 | AC_ARG_WITH(privsep-path, | 1879 | AC_ARG_WITH(privsep-path, |
1822 | [ --with-privsep-path=xxx Path for privilege separation chroot ], | 1880 | [ --with-privsep-path=xxx Path for privilege separation chroot (default=/var/empty)], |
1823 | [ | 1881 | [ |
1824 | if test "x$withval" != "$no" ; then | 1882 | if test "x$withval" != "$no" ; then |
1825 | PRIVSEP_PATH=$withval | 1883 | PRIVSEP_PATH=$withval |
@@ -1836,7 +1894,12 @@ AC_ARG_WITH(xauth, | |||
1836 | fi | 1894 | fi |
1837 | ], | 1895 | ], |
1838 | [ | 1896 | [ |
1839 | AC_PATH_PROG(xauth_path, xauth,,$PATH:/usr/X/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/openwin/bin) | 1897 | TestPath="$PATH" |
1898 | TestPath="${TestPath}${PATH_SEPARATOR}/usr/X/bin" | ||
1899 | TestPath="${TestPath}${PATH_SEPARATOR}/usr/bin/X11" | ||
1900 | TestPath="${TestPath}${PATH_SEPARATOR}/usr/X11R6/bin" | ||
1901 | TestPath="${TestPath}${PATH_SEPARATOR}/usr/openwin/bin" | ||
1902 | AC_PATH_PROG(xauth_path, xauth, , $TestPath) | ||
1840 | if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then | 1903 | if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then |
1841 | xauth_path="/usr/openwin/bin/xauth" | 1904 | xauth_path="/usr/openwin/bin/xauth" |
1842 | fi | 1905 | fi |
@@ -1890,7 +1953,8 @@ AC_ARG_WITH(mantype, | |||
1890 | ] | 1953 | ] |
1891 | ) | 1954 | ) |
1892 | if test -z "$MANTYPE"; then | 1955 | if test -z "$MANTYPE"; then |
1893 | AC_PATH_PROGS(NROFF, nroff awf, /bin/false, /usr/bin:/usr/ucb) | 1956 | TestPath="/usr/bin${PATH_SEPARATOR}/usr/ucb" |
1957 | AC_PATH_PROGS(NROFF, nroff awf, /bin/false, $TestPath) | ||
1894 | if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then | 1958 | if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then |
1895 | MANTYPE=doc | 1959 | MANTYPE=doc |
1896 | elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then | 1960 | elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then |