Mercurial > hg > octave-lyh > gnulib-hg
changeset 6021:257c2e42dede
Add gl_AVOID.
author | Simon Josefsson <simon@josefsson.org> |
---|---|
date | Thu, 11 Aug 2005 10:08:57 +0000 |
parents | b9cb7a737790 |
children | 3e49ae01bca0 |
files | doc/ChangeLog doc/gnulib.texi gnulib-tool |
diffstat | 3 files changed, 30 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2005-08-11 Simon Josefsson <jas@extundo.com> + + * gnulib.texi (Initial import, Finishing touches): Mention + gl_AVOID. + 2005-07-30 Karl Berry <karl@gnu.org> * gnulib.texi (Initial import): mention -I$(top_builddir)/lib.
--- a/doc/gnulib.texi +++ b/doc/gnulib.texi @@ -1,5 +1,5 @@ \input texinfo @c -*-texinfo-*- -@comment $Id: gnulib.texi,v 1.15 2005-07-30 13:47:19 karl Exp $ +@comment $Id: gnulib.texi,v 1.16 2005-08-11 10:08:57 jas Exp $ @comment %**start of header @setfilename gnulib.info @settitle GNU Gnulib @@ -7,7 +7,7 @@ @syncodeindex pg cp @comment %**end of header -@set UPDATED $Date: 2005-07-30 13:47:19 $ +@set UPDATED $Date: 2005-08-11 10:08:57 $ @copying This manual is for GNU Gnulib (updated @value{UPDATED}), @@ -413,12 +413,15 @@ macros in @file{m4/}. You can override these paths by using @code{--source-base=DIRECTORY} and @code{--m4-base=DIRECTORY}, or by adding @samp{gl_SOURCE_BASE(DIRECTORY)} and -@samp{gl_M4_BASE(DIRECTORY)} to your @file{configure.ac}. -Some modules also provide other files necessary -for building. These files are copied into the directory specified -by @samp{AC_CONFIG_AUX_DIR} in @file{configure.ac} or by the -@code{--aux-dir=DIRECTORY} option. If neither is specified, the -current directory is assumed. +@samp{gl_M4_BASE(DIRECTORY)} to your @file{configure.ac}. Some +modules also provide other files necessary for building. These files +are copied into the directory specified by @samp{AC_CONFIG_AUX_DIR} in +@file{configure.ac} or by the @code{--aux-dir=DIRECTORY} option. If +neither is specified, the current directory is assumed. If a module +is automatically added as a dependency is added, that you wish to +avoid, you may use @code{--avoid=MODULE}, possibly several times. Of +course, you will then need to implement the same interface as the +removed module. @code{gnulib-tool} can make symbolic links instead of copying the source files. Use the @code{--symbolic} @@ -608,7 +611,8 @@ gl_SOURCE_BASE(gl) gl_M4_BASE(gl/m4) gl_LIB(libgl) -gl_MODULES(getopt progname strdup dummy exit error getpass-gnu getaddrinfo) +gl_MODULES(xmalloc progname strdup dummy exit error getpass-gnu getaddrinfo) +gl_AVOID(xalloc-die) gl_INIT ... @end example @@ -622,7 +626,8 @@ macro can be used if you wish to change the library name (by default @file{libgnu.a} or @file{libgnu.la} if you use libtool). The @code{gl_MODULES} macro is used to specify which modules to import. - +@code{gl_AVOID} macro is used to specify which modules, that are +normally automatically added as a dependency, to avoid. @node Copying This Manual @appendix Copying This Manual
--- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2005-07-11 11:37:09 $' +cvsdatestamp='$Date: 2005-08-11 10:08:57 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -720,6 +720,9 @@ 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 @@ -952,6 +955,9 @@ /gl_MODULES[^_]/ { s,^.*gl_MODULES([[ ]*\([^])]*\).*$,ac_modules="\1",; p; }; + /gl_AVOID[^_]/ { + s,^.*gl_AVOID([[ ]*\([^])]*\).*$,ac_avoidlist="\1",; p; + }; /gl_SOURCE_BASE/ { s,^.*gl_SOURCE_BASE([[ ]*\([^])]*\).*$,ac_sourcebase="\1",; p; }; @@ -1008,6 +1014,9 @@ modules="$*" fi + # Which modules to avoid? + avoidlist="$avoidlist $ac_avoidlist" + func_import "$modules" ;;