Mercurial > hg > octave-nkf > gnulib-hg
changeset 8724:1b9db00ee960
* m4/argz.m4 (gl_FUNC_ARGZ): Use !HAVE_WORKING_ARGZ instead of
SYSTEM_ARGZ_IS_BROKEN. Also, minor stylistic improvements.
Report by Bruno Haible <bruno@clisp.org>.
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> |
---|---|
date | Thu, 26 Apr 2007 22:24:34 +0000 |
parents | cfb860006dc3 |
children | c9dd634e50d9 |
files | ChangeLog m4/argz.m4 |
diffstat | 2 files changed, 22 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-04-27 Charles Wilson <libtool@cwilson.fastmail.fm> + + * m4/argz.m4 (gl_FUNC_ARGZ): Use !HAVE_WORKING_ARGZ instead of + SYSTEM_ARGZ_IS_BROKEN. Also, minor stylistic improvements. + Report by Bruno Haible <bruno@clisp.org>. + 2007-04-26 Eric Blake <ebb9@byu.net> Fix fflush on mingw.
--- a/m4/argz.m4 +++ b/m4/argz.m4 @@ -41,34 +41,35 @@ [AC_CACHE_CHECK( [if argz actually works], [lt_cv_sys_argz_works], - [case $host_os in #( + [[case $host_os in #( *cygwin*) lt_cv_sys_argz_works=no if test "$cross_compiling" != no; then lt_cv_sys_argz_works="guessing no" else + lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/' save_IFS=$IFS IFS=-. - set x `uname -r | $SED -e 's/^\([[0-9\.]]*\).*/\1/'` + set x `uname -r | sed -e "$lt_sed_extract_leading_digits"` IFS=$save_IFS - lt_os_major=$[]{2-0} - lt_os_minor=$[]{3-0} - lt_os_micro=$[]{4-0} - if test "$lt_os_major" -gt 1 || - { test "$lt_os_major" -eq 1 && - { test "$lt_os_minor" -gt 5 || - { test "$lt_os_minor" -eq 5 && - test "$lt_os_micro" -gt 24; }; }; }; then + lt_os_major=${2-0} + lt_os_minor=${3-0} + lt_os_micro=${4-0} + if test "$lt_os_major" -gt 1 \ + || { test "$lt_os_major" -eq 1 \ + && { test "$lt_os_minor" -gt 5 \ + || { test "$lt_os_minor" -eq 5 \ + && test "$lt_os_micro" -gt 24; }; }; }; then lt_cv_sys_argz_works=yes fi fi ;; #( *) lt_cv_sys_argz_works=yes ;; - esac]) - AS_IF([test $lt_cv_sys_argz_works != yes], - [AC_DEFINE([SYSTEM_ARGZ_IS_BROKEN], 1, - [This value is set to 1 to indicate that the system argz facility does not work]) - ARGZ_H=argz.h + esac]]) + AS_IF([test $lt_cv_sys_argz_works = yes], + [AC_DEFINE([HAVE_WORKING_ARGZ], 1, + [This value is set to 1 to indicate that the system argz facility works])], + [ARGZ_H=argz.h AC_LIBOBJ([argz])])]) AC_SUBST([ARGZ_H])