Mercurial > hg > octave-lyh > gnulib-hg
changeset 6052:29087842aa86
* m4/getopt.m4 (gl_GETOPT_CHECK_HEADERS): Do not override the results
of gl_GETOPT_SUBSTITUTE. That way, if both gl_GETOPT_SUBSTITUTE
and gl_GETOPT are both invoked via different paths (as happens
with GNU tar CVS because it uses both argp and getopt), the former
wins.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Tue, 16 Aug 2005 18:45:50 +0000 |
| parents | c9d12df22e6e |
| children | 4cfaf4a21df2 |
| files | m4/ChangeLog m4/getopt.m4 |
| diffstat | 2 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,11 @@ +2005-08-16 Paul Eggert <eggert@cs.ucla.edu> + + * getopt.m4 (gl_GETOPT_CHECK_HEADERS): Do not override the results + of gl_GETOPT_SUBSTITUTE. That way, if both gl_GETOPT_SUBSTITUTE + and gl_GETOPT are both invoked via different paths (as happens + with GNU tar CVS because it uses both argp and getopt), the former + wins. + 2005-08-16 Bruno Haible <bruno@clisp.org> * strcase.m4 (gl_FUNC_STRCASECMP): Use the replacement function always.
--- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,4 +1,4 @@ -# getopt.m4 serial 10 +# getopt.m4 serial 11 dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -27,8 +27,10 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS], [ - GETOPT_H= - AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h]) + if test -z "$GETOPT_H"; then + AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h]) + fi + if test -z "$GETOPT_H"; then AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h]) fi