Mercurial > hg > octave-nkf > gnulib-hg
changeset 13759:38b745d4e6a4
gnulib-tool: Fixes for --create-testdir with --libtool.
* gnulib-tool (func_get_automake_snippet): Don't augment
EXTRA_lib_SOURCES for the pt_chown module, since pt_chown.o goes into
an executable.
(func_create_testdir): Handle module 'alloca' like func_import.
Reported by Bruce Korb <bruce.korb@gmail.com>.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 04 Oct 2010 02:23:23 +0200 |
parents | e50f7d9e3040 |
children | 7e5397f6cecf |
files | ChangeLog gnulib-tool |
diffstat | 2 files changed, 22 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-10-03 Bruno Haible <bruno@clisp.org> + + gnulib-tool: Fixes for --create-testdir with --libtool. + * gnulib-tool (func_get_automake_snippet): Don't augment + EXTRA_lib_SOURCES for the pt_chown module, since pt_chown.o goes into + an executable. + (func_create_testdir): Handle module 'alloca' like func_import. + Reported by Bruce Korb <bruce.korb@gmail.com>. + 2010-10-03 Paul Eggert <eggert@cs.ucla.edu> Avoid some lines longer than 80 characters.
--- a/gnulib-tool +++ b/gnulib-tool @@ -2228,6 +2228,7 @@ # automake will generate a useless dependency; this is harmless. case "$1" in relocatable-prog-wrapper) ;; + pt_chown) ;; *) func_filter_filelist extra_files "$nl" "$extra_files" '' '.c' '' '' if test -n "$extra_files"; then @@ -5128,6 +5129,12 @@ *) func_get_autoconf_snippet "$module" \ | sed -e "$sed_replace_build_aux" + if test "$module" = 'alloca' && test "$libtool" = true; then + echo 'changequote(,)dnl' + echo 'LTALLOCA=`echo "$ALLOCA" | sed -e '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' + echo 'changequote([, ])dnl' + echo 'AC_SUBST([LTALLOCA])' + fi ;; esac fi @@ -5250,6 +5257,12 @@ if test -n "$module"; then func_get_autoconf_snippet "$module" \ | sed -e "$sed_replace_build_aux" + if test "$module" = 'alloca' && test "$libtool" = true; then + echo 'changequote(,)dnl' + echo 'LTALLOCA=`echo "$ALLOCA" | sed -e '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' + echo 'changequote([, ])dnl' + echo 'AC_SUBST([LTALLOCA])' + fi fi done func_emit_initmacro_end $macro_prefix