Mercurial > hg > octave-lojdl > gnulib-hg
changeset 14929:3b43bd512c7b
canonicalize-lgpl: Move AC_LIBOBJ invocations to module description.
* m4/canonicalize.m4 (gl_CANONICALIZE_LGPL): Move AC_LIBOBJ invocation
from here...
* modules/canonicalize-lgpl (configure.ac): ... to here.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 06 May 2011 01:29:37 +0200 |
| parents | 965c92664dc8 |
| children | bf19e5e93993 |
| files | ChangeLog m4/canonicalize.m4 modules/canonicalize-lgpl |
| diffstat | 3 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-05-05 Bruno Haible <bruno@clisp.org> + + canonicalize-lgpl: Move AC_LIBOBJ invocations to module description. + * m4/canonicalize.m4 (gl_CANONICALIZE_LGPL): Move AC_LIBOBJ invocation + from here... + * modules/canonicalize-lgpl (configure.ac): ... to here. + 2011-05-05 Bruno Haible <bruno@clisp.org> calloc-posix, calloc-gnu: Move AC_LIBOBJs to module description.
--- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -1,4 +1,4 @@ -# canonicalize.m4 serial 21 +# canonicalize.m4 serial 22 dnl Copyright (C) 2003-2007, 2009-2011 Free Software Foundation, Inc. @@ -30,16 +30,14 @@ AC_REQUIRE([gl_CANONICALIZE_LGPL_SEPARATE]) if test $ac_cv_func_canonicalize_file_name = no; then HAVE_CANONICALIZE_FILE_NAME=0 - AC_LIBOBJ([canonicalize-lgpl]) if test $ac_cv_func_realpath = no; then HAVE_REALPATH=0 elif test "$gl_cv_func_realpath_works" != yes; then REPLACE_REALPATH=1 fi elif test "$gl_cv_func_realpath_works" != yes; then - AC_LIBOBJ([canonicalize-lgpl]) + REPLACE_CANONICALIZE_FILE_NAME=1 REPLACE_REALPATH=1 - REPLACE_CANONICALIZE_FILE_NAME=1 fi ])
--- a/modules/canonicalize-lgpl +++ b/modules/canonicalize-lgpl @@ -21,6 +21,9 @@ configure.ac: gl_CANONICALIZE_LGPL +if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then + AC_LIBOBJ([canonicalize-lgpl]) +fi gl_MODULE_INDICATOR([canonicalize-lgpl]) gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name]) gl_STDLIB_MODULE_INDICATOR([realpath])