diff options
| author | James Youngman <jay@gnu.org> | 2011-05-30 00:34:18 +0100 |
|---|---|---|
| committer | James Youngman <jay@gnu.org> | 2011-05-30 02:00:23 +0100 |
| commit | d09450a94c55b85a6ede44938b03d4968681c39a (patch) | |
| tree | db512514b206232f6a90781547fd66b88fe66993 /configure.ac | |
| parent | de53ac26074b94ec249e69f9850b999efae4f1d3 (diff) | |
| download | findutils-d09450a94c55b85a6ede44938b03d4968681c39a.tar.gz | |
Manage gnulib as a git submodule.
* .gitmodules: New file; manage gnulib as a submodule. For future
compatibility with the "bootstrap" script, keep the gnulib
submodule in the gnulib directory (instead of the gnulib-git
directory as before). This means we need to find a new directory
for the output of gnulib-tool; we will use "gl" for that.
* import-gnulib.sh (do_checkout): Replace with do_submodule.
(do_submodule): initialise and configure the gnulib module.
(main): call do_submodule instead of do_checkout. Don't call
move_cvsdir, it's obsolete.
(move_cvsdir): delete
* Makefile.am (SUBDIRS): Rename gnulib to gl.
(ACLOCAL_AMFLAGS): Likewise.
(findutils-check-smells): Rename gnulib-git to gnulib.
* .gitignore: Rename gnulib to gl.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index da410602..9aff8c83 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([find/pred.c]) AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST -AC_CONFIG_MACRO_DIR(gnulib/m4) +AC_CONFIG_MACRO_DIR(gl/m4) dnl Set of available languages. ALL_LINGUAS="be bg cs ca da de el eo es et fi fr ga gl hr hu id it ja ko lg lt ms nl pl pt pt_BR ro ru rw sk sl sr sv tr uk vi zh_CN zh_TW" @@ -93,7 +93,7 @@ gl_WARN_ADD([-Wdeclaration-after-statement]) gl_WARN_ADD([-Wall]) -dnl Older versions of gnulib/m4/nls.m4 provide AM_MKINSTALLDIRS. +dnl Older versions of gl/m4/nls.m4 provide AM_MKINSTALLDIRS. dnl The current version of gnulib does not, but the version of dnl po/Makefile.in.in that comes with gettext-0.14.6 expects dnl that @MKINSTALLDIRS@ will be expanded. @@ -222,8 +222,8 @@ build-aux/Makefile doc/Makefile find/Makefile find/testsuite/Makefile -gnulib/Makefile -gnulib/lib/Makefile +gl/Makefile +gl/lib/Makefile lib/Makefile locate/Makefile locate/testsuite/Makefile |