Mercurial > hg > octave-nkf > gnulib-hg
changeset 12978:b7726f620298
gnulib-tool: Add support for --libtool in --create-testdir.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Tue, 09 Mar 2010 00:09:41 +0100 |
parents | a8f8215a262d |
children | 845824c37d6a |
files | ChangeLog gnulib-tool |
diffstat | 2 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-03-08 Bruno Haible <bruno@clisp.org> + + gnulib-tool: Add support for --libtool in --create-testdir. + * gnulib-tool (LIBTOOLPATH, LIBTOOLIZE): New variables. + (func_create_testdir): Emit LT_INIT invocations. Invoke LIBTOOLIZE. + 2010-03-08 Eric Blake <eblake@redhat.com> gnulib-tool.texi: mention possibility of git submodule
--- a/gnulib-tool +++ b/gnulib-tool @@ -40,6 +40,9 @@ # You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH. GETTEXTPATH= +# You can set LIBTOOLPATH to empty if libtoolize 2.x is already in your PATH. +LIBTOOLPATH= + # If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the # variables AUTOCONF, AUTOHEADER, ACLOCAL, AUTOMAKE, AUTORECONF individually. if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then @@ -63,6 +66,11 @@ AUTOPOINT="${GETTEXTPATH}autopoint" fi +# If you didn't set LIBTOOLPATH, you can also set the variable LIBTOOLIZE. +if test -z "${LIBTOOLIZE}" || test -n "${LIBTOOLPATH}"; then + LIBTOOLIZE="${LIBTOOLPATH}autopoint" +fi + # You can set MAKE. if test -z "${MAKE}"; then MAKE=make @@ -4628,6 +4636,7 @@ done \ | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' if test "$libtool" = true; then + echo "LT_INIT([win32-dll])" echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" echo "gl_cond_libtool=true" else @@ -4751,6 +4760,7 @@ done \ | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' if test "$libtool" = true; then + echo "LT_INIT([win32-dll])" echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" echo "gl_cond_libtool=true" else @@ -4829,6 +4839,9 @@ fi done fi + if test "$libtool" = true; then + func_execute_command ${LIBTOOLIZE} --copy || func_exit 1 + fi func_execute_command ${ACLOCAL} -I $m4base || func_exit 1 if ! test -d build-aux; then func_execute_command mkdir build-aux || func_exit 1