diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 19 |
2 files changed, 20 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index aed8496b8..f9f93cd78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ 2006-05-29 Peter Stephenson <p.w.stephenson@ntlworld.com> - * 10343: Src/exec.c: make bad #! interpreters print a more - informative message. + * 22470: configure.ac: incorporate extensions to errno.h + searching found by <johann@myrkraverk.com> trying to maximise + matches and minimise the risk of finding the wrong file. + + * zsh-users/10343: Src/exec.c: make bad #! interpreters print a + more informative message. 2006-05-28 Clint Adams <clint@zsh.org> diff --git a/configure.ac b/configure.ac index 77ba9a9f9..f4eb5c56e 100644 --- a/configure.ac +++ b/configure.ac @@ -1312,16 +1312,25 @@ sed 's/\\\\\\\\/\//g' | $AWK '{ if ($1 ~ /err/) files[[$1]] = $1 } END { for (var in files) print var }'`" rm -f nametmp.c -for ERRNO_H in $errfile_list /dev/null +lnerrs=0 +for ERRNO_TRY_H in $errfile_list /dev/null do dnl Try to make sure it doesn't get confused by files that don't dnl have real error definitions in. Count definitions to make sure. - nerrs=`test -f $ERRNO_H && \ - $EGREP '#[ ]*define[ ][ ]*E[0-9A-Z]*[ ]*(_HURD_ERRNO \()?[0-9]+\)?' $ERRNO_H | \ + dnl Definitions of error numbers have become more and more general, so + dnl pick the file with the most matches, which must be at least 7. + dnl Careful with cut and paste in the pattern: the square brackets + dnl must contain a space and a tab. + nerrs=`test -f $ERRNO_TRY_H && \ + $EGREP '#[ ]*define[ ][ ]*E[0-9A-Z]*[ ]*(_HURD_ERRNO )?\(?[_A-Z0-9]' $ERRNO_TRY_H | \ wc -l | sed 's/[ ]//g'` - test "x$nerrs" != x && test "$nerrs" -ge 7 && break + if test "x$nerrs" != x && test "$nerrs" -ge 7 && test "$nerrs" -gt "$lnerrs" + then + lnerrs=$nerrs + ERRNO_H=$ERRNO_TRY_H + fi done -if test x$ERRNO_H = x"/dev/null"; then +if test x$ERRNO_H = x; then AC_MSG_ERROR(ERROR MACROS NOT FOUND: please report to developers) fi zsh_cv_path_errno_h=$ERRNO_H |