bug-m4
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

update use of gnulib-tool


From: Bruno Haible
Subject: update use of gnulib-tool
Date: Tue, 2 May 2006 16:40:34 +0200
User-agent: KMail/1.5

Hi,

The way of invoking gnulib-tool has changed in the last few months:
Parameters are now cached in a separate file gnulib-cache.m4 that is
meant to be stored in CVS, and no longer provided in configure.ac.

The steps to update to a new gnulib-tool are:

1) Run once the command

$ gnulib-tool --import --source-base=gnu --m4-base=ltdl/m4 \
                       assert error exit free gettext mkstemp obstack \
                       progname regex stdbool strtol xalloc xalloc-die \
                       xstrndup

2) Remove the configuration from configure.ac:

*** configure.ac.bak    2005-08-25 22:15:34.000000000 +0200
--- configure.ac        2006-04-30 00:37:28.000000000 +0200
***************
*** 143,153 ****
  ## --------------- ##
  ## Gnulib support, ##
  ## --------------- ##
- gl_SOURCE_BASE(gnu)
- gl_M4_BASE(ltdl/m4)
- # We also use getopt and version-etc, but they are copied into
- # the project tree by bootstrap since they are used only by m4 itself.
- gl_MODULES(assert error exit free gettext mkstemp obstack progname regex 
stdbool strtol xalloc xalloc-die xstrndup)
  gl_INIT
  
  # Gnulib doesn't always do things quite the way M4 would like...
--- 144,149 ----

3) Commit ltdl/m4/gnulib-cache.m4 into the CVS.

4) Change bootstrap to use "gnulib-tool --update":

*** bootstrap.bak       2006-04-29 18:20:51.000000000 +0200
--- bootstrap   2006-04-30 01:08:58.000000000 +0200
***************
*** 117,124 ****
  ## Import Gnulib modules. ##
  ## ---------------------- ##
  
! func_echo "running: ${GNULIB_TOOL} --import"
! ${GNULIB_TOOL} --import
  
  func_echo "patching include directories in gnulib regex module"
  mv $config_macro_dir/regex.m4 $config_macro_dir/regex-m4.old
--- 117,124 ----
  ## Import Gnulib modules. ##
  ## ---------------------- ##
  
! func_echo "running: ${GNULIB_TOOL} --update"
! ${GNULIB_TOOL} --update
  
  func_echo "patching include directories in gnulib regex module"
  mv $config_macro_dir/regex.m4 $config_macro_dir/regex-m4.old


Bruno





reply via email to

[Prev in Thread] Current Thread [Next in Thread]