Mercurial > hg > octave-lojdl > gnulib-hg
changeset 13387:c8df5a4f551f
Simplify gl_LIBUNISTRING_VERSION_CMP expansion.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Thu, 03 Jun 2010 23:54:36 +0200 |
| parents | 36af21ca41f7 |
| children | 9ef3893d2c73 |
| files | ChangeLog m4/libunistring-base.m4 |
| diffstat | 2 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-06-03 Bruno Haible <bruno@clisp.org> + + Simplify gl_LIBUNISTRING_VERSION_CMP expansion. + * m4/libunistring-base.m4 (gl_LIBUNISTRING_VERSION_CMP): Ensure + expansion does not end with a newline. + (gl_LIBUNISTRING_LIBSOURCE, gl_LIBUNISTRING_LIBHEADER): Avoid + unnecessary newline. + 2010-06-03 Bruno Haible <bruno@clisp.org> Reduce dependencies.
--- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,4 +1,4 @@ -# libunistring-base.m4 serial 3 +# libunistring-base.m4 serial 4 dnl Copyright (C) 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -23,8 +23,7 @@ AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE]) dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from dnl gl_LIBUNISTRING_CORE if that macro has been run. - if gl_LIBUNISTRING_VERSION_CMP([$1]) - then + if gl_LIBUNISTRING_VERSION_CMP([$1]); then m4_foreach_w([gl_source_file], [$2], [AC_LIBOBJ(m4_bpatsubst(m4_defn([gl_source_file]), [\.c$], [])) ]) @@ -53,8 +52,7 @@ AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE]) dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from dnl gl_LIBUNISTRING_CORE if that macro has been run. - if gl_LIBUNISTRING_VERSION_CMP([$1]) - then + if gl_LIBUNISTRING_VERSION_CMP([$1]); then LIBUNISTRING_[]AS_TR_CPP([$2])='$2' else LIBUNISTRING_[]AS_TR_CPP([$2])= @@ -138,8 +136,7 @@ } ]) } - } -]) + }]) dnl gl_LIBUNISTRING_ARG_OR_ZERO([ARG], [ORIG]) expands to ARG if it is not the dnl same as ORIG, otherwise to 0.