diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-07-05 20:35:31 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-07-05 20:35:31 +0000 |
| commit | 6ff09d71edb9b8f6b281847ccee3095dc01e3d9e (patch) | |
| tree | 559338e94d47c6ac144e6c8f4358cf25cdb22b13 /src | |
| parent | bca3f11932ae16648c77b441b55c78525c4d64d3 (diff) | |
| download | krb5-6ff09d71edb9b8f6b281847ccee3095dc01e3d9e.tar.gz krb5-6ff09d71edb9b8f6b281847ccee3095dc01e3d9e.tar.xz krb5-6ff09d71edb9b8f6b281847ccee3095dc01e3d9e.zip | |
* aclocal.m4 (CHECK_WAIT_TYPE): Improved testing if wait uses int
or struct union as an argument. Tests if a prototype conflict
exists with int being used, and if so, falls back on the old test.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13565 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/aclocal.m4 | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9c0106804..5d268eec5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2001-07-05 Ezra Peisach <epeisach@mit.edu> + + * aclocal.m4 (CHECK_WAIT_TYPE): Improved testing if wait uses int + or struct union as an argument. Tests if a prototype conflict + exists with int being used, and if so, falls back on the old test. + 2001-06-21 Ezra Peisach <epeisach@mit.edu> * aclocal.m4 (KRB5_LIB_PARAMS): Display test for host type and diff --git a/src/aclocal.m4 b/src/aclocal.m4 index a82db6375..39ad34fee 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -145,15 +145,19 @@ dnl dnl check if union wait is defined, or if WAIT_USES_INT -- CHECK_WAIT_TYPE dnl define(CHECK_WAIT_TYPE,[ -AC_MSG_CHECKING([for union wait]) +AC_MSG_CHECKING([if argument to wait is int *]) AC_CACHE_VAL(krb5_cv_struct_wait, +dnl Test for prototype clash - if there is none - then assume int * works +[AC_TRY_COMPILE([#include <sys/wait.h> +extern pid_t wait(int *);],[], krb5_cv_struct_wait=no,dnl +dnl Else fallback on old stuff [AC_TRY_COMPILE( [#include <sys/wait.h>], [union wait i; #ifdef WEXITSTATUS WEXITSTATUS (i); #endif ], - krb5_cv_struct_wait=yes, krb5_cv_struct_wait=no)]) + krb5_cv_struct_wait=yes, krb5_cv_struct_wait=no)])]) AC_MSG_RESULT($krb5_cv_struct_wait) if test $krb5_cv_struct_wait = no; then AC_DEFINE(WAIT_USES_INT) |