diff options
| author | Tim Rice <tim@multitalents.net> | 2002-05-27 17:37:32 -0700 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2002-05-27 17:37:32 -0700 |
| commit | 28bbb0c458c1f6cee5c3de1cec1f9dfea14d7196 (patch) | |
| tree | d3363c5647504f6dfeb541f9d71ceac504247aef /configure.ac | |
| parent | 116e6dfaad3543c381ef48e0c42a3a86cebe644c (diff) | |
[configure.ac.orig monitor_fdpass.c] Enahnce msghdr tests to address
build problem on Irix reported by Dave Love <d.love@dl.ac.uk>. Back out
last monitor_fdpass.c changes that are no longer needed with new tests.
Patch tested on Irix by Jan-Frode Myklebust <janfrode@parallab.uib.no>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index df78b789..628adb39 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.63 2002/05/22 01:02:15 djm Exp $ +# $Id: configure.ac,v 1.64 2002/05/28 00:37:33 tim Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -1499,15 +1499,23 @@ if test "x$ac_cv_have_pw_change_in_struct_passwd" = "xyes" ; then AC_DEFINE(HAVE_PW_CHANGE_IN_PASSWD) fi +dnl make sure we're using the real structure members and not defines AC_CACHE_CHECK([for msg_accrights field in struct msghdr], ac_cv_have_accrights_in_msghdr, [ - AC_TRY_COMPILE( + AC_TRY_RUN( [ #include <sys/types.h> #include <sys/socket.h> #include <sys/uio.h> +int main() { +#ifdef msg_accrights +exit(1); +#endif +struct msghdr m; +m.msg_accrights = 0; +exit(0); +} ], - [ struct msghdr m; m.msg_accrights = 0; ], [ ac_cv_have_accrights_in_msghdr="yes" ], [ ac_cv_have_accrights_in_msghdr="no" ] ) @@ -1518,13 +1526,20 @@ fi AC_CACHE_CHECK([for msg_control field in struct msghdr], ac_cv_have_control_in_msghdr, [ - AC_TRY_COMPILE( + AC_TRY_RUN( [ #include <sys/types.h> #include <sys/socket.h> #include <sys/uio.h> +int main() { +#ifdef msg_control +exit(1); +#endif +struct msghdr m; +m.msg_control = 0; +exit(0); +} ], - [ struct msghdr m; m.msg_control = 0; ], [ ac_cv_have_control_in_msghdr="yes" ], [ ac_cv_have_control_in_msghdr="no" ] ) |