Mercurial > hg > octave-lojdl > gnulib-hg

comparison gnulib-tool @ 12978:b7726f620298

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 cb00143b4bf6
children 845824c37d6a
comparison
equal deleted inserted replaced
12977:a8f8215a262d 12978:b7726f620298
38 AUTOMAKEPATH= 38 AUTOMAKEPATH=
39 39
40 # You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH. 40 # You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH.
41 GETTEXTPATH= 41 GETTEXTPATH=
42 42
43 # You can set LIBTOOLPATH to empty if libtoolize 2.x is already in your PATH.
44 LIBTOOLPATH=
45
43 # If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the 46 # If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the
44 # variables AUTOCONF, AUTOHEADER, ACLOCAL, AUTOMAKE, AUTORECONF individually. 47 # variables AUTOCONF, AUTOHEADER, ACLOCAL, AUTOMAKE, AUTORECONF individually.
45 if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then 48 if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then
46 AUTOCONF="${AUTOCONFPATH}autoconf" 49 AUTOCONF="${AUTOCONFPATH}autoconf"
47 fi 50 fi
59 fi 62 fi
60 63
61 # If you didn't set GETTEXTPATH, you can also set the variable AUTOPOINT. 64 # If you didn't set GETTEXTPATH, you can also set the variable AUTOPOINT.
62 if test -z "${AUTOPOINT}" || test -n "${GETTEXTPATH}"; then 65 if test -z "${AUTOPOINT}" || test -n "${GETTEXTPATH}"; then
63 AUTOPOINT="${GETTEXTPATH}autopoint" 66 AUTOPOINT="${GETTEXTPATH}autopoint"
67 fi
68
69 # If you didn't set LIBTOOLPATH, you can also set the variable LIBTOOLIZE.
70 if test -z "${LIBTOOLIZE}" || test -n "${LIBTOOLPATH}"; then
71 LIBTOOLIZE="${LIBTOOLPATH}autopoint"
64 fi 72 fi
65 73
66 # You can set MAKE. 74 # You can set MAKE.
67 if test -z "${MAKE}"; then 75 if test -z "${MAKE}"; then
68 MAKE=make 76 MAKE=make
4626 esac 4634 esac
4627 fi 4635 fi
4628 done \ 4636 done \
4629 | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' 4637 | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/'
4630 if test "$libtool" = true; then 4638 if test "$libtool" = true; then
4639 echo "LT_INIT([win32-dll])"
4631 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" 4640 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
4632 echo "gl_cond_libtool=true" 4641 echo "gl_cond_libtool=true"
4633 else 4642 else
4634 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" 4643 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
4635 echo "gl_cond_libtool=false" 4644 echo "gl_cond_libtool=false"
4749 func_get_autoconf_early_snippet "$module" 4758 func_get_autoconf_early_snippet "$module"
4750 fi 4759 fi
4751 done \ 4760 done \
4752 | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' 4761 | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/'
4753 if test "$libtool" = true; then 4762 if test "$libtool" = true; then
4763 echo "LT_INIT([win32-dll])"
4754 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" 4764 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
4755 echo "gl_cond_libtool=true" 4765 echo "gl_cond_libtool=true"
4756 else 4766 else
4757 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" 4767 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
4758 echo "gl_cond_libtool=false" 4768 echo "gl_cond_libtool=false"
4827 if test -f $f; then 4837 if test -f $f; then
4828 mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1 4838 mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1
4829 fi 4839 fi
4830 done 4840 done
4831 fi 4841 fi
4842 if test "$libtool" = true; then
4843 func_execute_command ${LIBTOOLIZE} --copy || func_exit 1
4844 fi
4832 func_execute_command ${ACLOCAL} -I $m4base || func_exit 1 4845 func_execute_command ${ACLOCAL} -I $m4base || func_exit 1
4833 if ! test -d build-aux; then 4846 if ! test -d build-aux; then
4834 func_execute_command mkdir build-aux || func_exit 1 4847 func_execute_command mkdir build-aux || func_exit 1
4835 fi 4848 fi
4836 func_execute_command ${AUTOCONF} || func_exit 1 4849 func_execute_command ${AUTOCONF} || func_exit 1