diff options
| -rw-r--r-- | THANKS | 2 | ||||
| -rwxr-xr-x | bootstrap | 6 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | ltdl/m4/gnulib-cache.m4 | 27 |
4 files changed, 33 insertions, 9 deletions
@@ -26,10 +26,12 @@ Bjorn R. Bjornsson brb@falcon.is Brendan Kehoe brendan@cygnus.com Brian J. Fox bfox@datawave.net Brian D. Carlstrom bdc@clark.lcs.mit.edu +Bruno Haible bruno@clisp.org David J. MacKenzie djm@uunet.uu.net Erez Zadok ezk@cs.columbia.edu Eric Allman eric@cs.berkeley.edu Eric Backus ericb@lsid.hp.com +Eric Blake ebb9@byu.net Eric Fischer enf1@ellis.uchicago.edu Erick Branderhorst Erick.Branderhorst@asml.nl François Pinard pinard@iro.umontreal.ca @@ -89,7 +89,7 @@ esac ## ---------------------------- ## case $GNULIB_TOOL in - /* ) gnulibdir=$GNULIB_TOOL ;; # absolute + /* ) gnulibdir=$GNULIB_TOOL ;; # absolute */* ) gnulibdir=`pwd`/$GNULIB_TOOL ;; # relative * ) gnulibdir=`which "$GNULIB_TOOL"` ;; # PATH search esac @@ -117,8 +117,8 @@ gnulibdir=`echo "$gnulibdir" | $SED "$dirname"` ## Import Gnulib modules. ## ## ---------------------- ## -func_echo "running: ${GNULIB_TOOL} --import" -${GNULIB_TOOL} --import +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 diff --git a/configure.ac b/configure.ac index 0b4c1504..7fdfe112 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Configure template for GNU m4. -*-Autoconf-*- -# Copyright (C) 1991, 1992, 1993, 1994, 2000, 2001, 2002, 2004, 2005 +# Copyright (C) 1991, 1992, 1993, 1994, 2000, 2001, 2002, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -143,11 +143,6 @@ m4_GNU_GETTEXT ## --------------- ## ## 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... diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4 new file mode 100644 index 00000000..36b5e623 --- /dev/null +++ b/ltdl/m4/gnulib-cache.m4 @@ -0,0 +1,27 @@ +# Copyright (C) 2004 Free Software Foundation, Inc. +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# Generated by gnulib-tool. +# +# This file represents the specification of how gnulib-tool is used. +# It acts as a cache: It is written and read by gnulib-tool. +# In projects using CVS, this file is meant to be stored in CVS, +# like the configure.ac and various Makefile.am files. + + +# Specification in the form of a command-line invocation: +# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --aux-dir=ltdl/config --libtool --macro-prefix=gl assert error exit free gettext mkstemp obstack progname regex stdbool strtol xalloc xalloc-die xstrndup + +# Specification in the form of a few gnulib-tool.m4 macro invocations: +gl_MODULES([assert error exit free gettext mkstemp obstack progname regex stdbool strtol xalloc xalloc-die xstrndup]) +gl_AVOID([]) +gl_SOURCE_BASE([gnu]) +gl_M4_BASE([ltdl/m4]) +gl_TESTS_BASE([tests]) +gl_LIB([libgnu]) +gl_LIBTOOL +gl_MACRO_PREFIX([gl]) |