Mercurial > hg > octave-lyh > gnulib-hg
changeset 6414:46d47c8fe734
* gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
libtool is used (to be used by modules Makefile.am snippet),
suggested by Bruno Haible <bruno@clisp.org>.
* modules/gc (Makefile.am): Use it.
| author | Simon Josefsson <simon@josefsson.org> |
|---|---|
| date | Fri, 21 Oct 2005 13:14:34 +0000 |
| parents | 8d1c43d7719f |
| children | 8fdeec35e290 |
| files | ChangeLog gnulib-tool modules/gc |
| diffstat | 3 files changed, 28 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-10-21 Simon Josefsson <jas@extundo.com> + + * gnulib-tool: Define automake conditional GL_COND_LIBTOOL if + libtool is used (to be used by modules Makefile.am snippet), + suggested by Bruno Haible <bruno@clisp.org>. + + * modules/gc (Makefile.am): Use it. + 2005-10-21 Simon Josefsson <jas@extundo.com> * modules/des, modules/des-tests: New files.
--- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2005-10-17 15:44:51 $' +cvsdatestamp='$Date: 2005-10-21 13:14:35 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -1226,6 +1226,11 @@ echo "# \"Check for header files, types and library functions\"." echo "AC_DEFUN([${macro_prefix}_INIT]," echo "[" + if test -z "$libtool"; then + echo "AM_CONDITIONAL(GL_COND_LIBTOOL, false)" + else + echo "AM_CONDITIONAL(GL_COND_LIBTOOL, true)" + fi for module in $modules; do func_verify_module if test -n "$module"; then @@ -1426,6 +1431,11 @@ echo "gl_USE_SYSTEM_EXTENSIONS" echo fi + if test -z "$libtool"; then + echo "AM_CONDITIONAL(GL_COND_LIBTOOL, false)" + else + echo "AM_CONDITIONAL(GL_COND_LIBTOOL, true)" + fi # We don't have explicit ordering constraints between the various # autoconf snippets. It's cleanest to put those of the library before # those of the tests. @@ -1485,6 +1495,11 @@ echo "gl_USE_SYSTEM_EXTENSIONS" echo fi + if test -z "$libtool"; then + echo "AM_CONDITIONAL(GL_COND_LIBTOOL, false)" + else + echo "AM_CONDITIONAL(GL_COND_LIBTOOL, true)" + fi for module in $modules; do func_verify_nontests_module if test -n "$module"; then