Mercurial > hg > octave-nkf > gnulib-hg
changeset 8890:576d3e4f31c2
Remember the presence of the --with-tests command-line option through
"gnulib-tool --update".
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 28 May 2007 15:46:54 +0000 |
parents | 4f3e993d4155 |
children | 633babea5f62 |
files | ChangeLog gnulib-tool |
diffstat | 2 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-05-28 Bruno Haible <bruno@clisp.org> + + * gnulib-tool (func_import): Remember the --with-tests command-line + option through the macro gl_WITH_TESTS in the gnulib-cache.m4. + Reported by Eric Blake. + 2007-05-28 Bruno Haible <bruno@clisp.org> * modules/ftell-tests: New file.
--- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2007-04-12 13:02:00 $' +cvsdatestamp='$Date: 2007-05-28 15:46:55 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` nl=' @@ -1566,6 +1566,7 @@ cached_m4base= cached_docbase= cached_testsbase= + cached_inctests= cached_libname= cached_lgpl= cached_makefile_name= @@ -1599,6 +1600,9 @@ /gl_TESTS_BASE(/ { s,^.*gl_TESTS_BASE([[ ]*\([^])]*\).*$,cached_testsbase="\1",p } + /gl_WITH_TESTS/ { + s,^.*$,cached_inctests=true,p + } /gl_LIB(/ { s,^.*gl_LIB([[ ]*\([^])]*\).*$,cached_libname="\1",p } @@ -1687,6 +1691,10 @@ func_fatal_error "missing --tests-base option" fi fi + # Require the tests if specified either way. + if test -z "$inctests"; then + inctests="$cached_inctests" + fi # The libname defaults to the cached one. if test -z "$supplied_libname"; then libname="$cached_libname" @@ -1977,6 +1985,9 @@ func_append actioncmd " --m4-base=$m4base" func_append actioncmd " --doc-base=$docbase" func_append actioncmd " --aux-dir=$auxdir" + if test -n "$inctests"; then + func_append actioncmd " --with-tests" + fi for module in $avoidlist; do func_append actioncmd " --avoid=$module" done @@ -2066,6 +2077,7 @@ echo "gl_M4_BASE([$m4base])" echo "gl_DOC_BASE([$docbase])" echo "gl_TESTS_BASE([$testsbase])" + test -z "$inctests" || echo "gl_WITH_TESTS" echo "gl_LIB([$libname])" test -z "$lgpl" || echo "gl_LGPL" echo "gl_MAKEFILE_NAME([$makefile_name])" @@ -3080,7 +3092,8 @@ # Perform func_import in a subshell, so that variable values # such as # local_gnulib_dir, avoidlist, sourcebase, m4base, docbase, - # testsbase, libname, lgpl, makefile_name, libtool, macro_prefix + # testsbase, inctests, libname, lgpl, makefile_name, libtool, + # macro_prefix # don't propagate from one directory to another. (func_import) || func_exit 1 done