Mercurial > hg > octave-lyh > gnulib-hg
changeset 6177:526c97a9fd70
Put all dummy definitions of gnulib-tool's specification macros into
gnulib-tool.m4.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Wed, 31 Aug 2005 20:51:09 +0000 |
| parents | 1a1e2f878f04 |
| children | 3830993b4c7a |
| files | ChangeLog gnulib-tool m4/ChangeLog m4/gnulib-tool.m4 |
| diffstat | 4 files changed, 44 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-28 Bruno Haible <bruno@clisp.org> + + * gnulib-tool (func_import): Also copy m4/gnulib-tool.m4. Omit + declaration macro definitions from generated gnulib.m4. + 2005-08-28 Bruno Haible <bruno@clisp.org> * gnulib-tool: New option --macro-prefix.
--- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2005-08-31 20:49:31 $' +cvsdatestamp='$Date: 2005-08-31 20:51:09 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -786,7 +786,7 @@ || func_fatal_error "refusing to do nothing" # Copy files or make symbolic links. - for f in $files; do + for f in $files m4/gnulib-tool.m4; do source= case "$f" in build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; @@ -880,30 +880,6 @@ done echo "])" echo - echo "dnl Usage: gl_MODULES([module1 module2 ...])" - echo "AC_DEFUN([gl_MODULES], [])" - echo - echo "dnl Usage: gl_AVOID([module1 module2 ...])" - echo "AC_DEFUN([gl_AVOID], [])" - echo - echo "dnl Usage: gl_SOURCE_BASE([DIR])" - echo "AC_DEFUN([gl_SOURCE_BASE], [])" - echo - echo "dnl Usage: gl_M4_BASE([DIR])" - echo "AC_DEFUN([gl_M4_BASE], [])" - echo - echo "dnl Usage: gl_LIB([LIBNAME])" - echo "AC_DEFUN([gl_LIB], [])" - echo - echo "dnl Usage: gl_LGPL" - echo "AC_DEFUN([gl_LGPL], [])" - echo - echo "dnl Usage: gl_LIBTOOL" - echo "AC_DEFUN([gl_LIBTOOL], [])" - echo - echo "dnl Usage: gl_MACRO_PREFIX([PREFIX])" - echo "AC_DEFUN([gl_MACRO_PREFIX], [])" - echo echo "# gnulib.m4 ends here" ) func_mv_if_changed "$destdir"/$m4base/gnulib.m4.new "$destdir"/$m4base/gnulib.m4
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2005-08-28 Bruno Haible <bruno@clisp.org> + + * gnulib-tool.m4: New file. + 2005-08-27 Jim Meyering <jim@meyering.net> * stdlib-safer.m4: New file. From coreutils.
new file mode 100644 --- /dev/null +++ b/m4/gnulib-tool.m4 @@ -0,0 +1,33 @@ +# gnulib-tool.m4 serial 1 +dnl Copyright (C) 2004-2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl The following macros need not be invoked explicitly. +dnl Invoking them does nothing except to declare default arguments +dnl for "gnulib-tool --import". + +dnl Usage: gl_MODULES([module1 module2 ...]) +AC_DEFUN([gl_MODULES], []) + +dnl Usage: gl_AVOID([module1 module2 ...]) +AC_DEFUN([gl_AVOID], []) + +dnl Usage: gl_SOURCE_BASE([DIR]) +AC_DEFUN([gl_SOURCE_BASE], []) + +dnl Usage: gl_M4_BASE([DIR]) +AC_DEFUN([gl_M4_BASE], []) + +dnl Usage: gl_LIB([LIBNAME]) +AC_DEFUN([gl_LIB], []) + +dnl Usage: gl_LGPL +AC_DEFUN([gl_LGPL], []) + +dnl Usage: gl_LIBTOOL +AC_DEFUN([gl_LIBTOOL], []) + +dnl Usage: gl_MACRO_PREFIX([PREFIX]) +AC_DEFUN([gl_MACRO_PREFIX], [])