diff options
| author | Eric Blake <ebb9@byu.net> | 2008-03-24 05:51:10 -0600 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-03-25 21:56:39 +0100 |
| commit | 5f2ea441ac7eb7ace61e1ae422c5ae9165f02258 (patch) | |
| tree | 6bddca80b12d56ec6d506b27e42d564298390eff /configure.ac | |
| parent | da9f5e7fdffbb31f5c5949d5f931e757aa65e7c7 (diff) | |
| download | coreutils-5f2ea441ac7eb7ace61e1ae422c5ae9165f02258.tar.xz | |
Use new gnulib gnumakefile module.
* bootstrap.conf (gnulib_modules): Pull in new module.
* GNUmakefile: Remove from version control.
* .gitignore: Update.
* configure.ac (AC_CONFIG_LINKS): Delete; rely on gnulib to do
this now.
* Makefile.am (EXTRA_DIST, distclean-local): Likewise.
Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 14505fc52..0e101a14a 100644 --- a/configure.ac +++ b/configure.ac @@ -334,20 +334,6 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES]) AM_GNU_GETTEXT([external], [need-formatstring-macros]) AM_GNU_GETTEXT_VERSION([0.15]) -dnl Allow maintainer rules under GNU make even in VPATH builds. This does -dnl not work in autoconf 2.61 or earlier, but we don't want to require -dnl non-maintainers to use unreleased autoconf, hence the version test. -dnl TODO remove the version check once autoconf 2.62 is released. -dnl Meanwhile, we must use a shell variable so that we bypass automake's -dnl attempts to remove the sole copy of GNUmakefile in a non-VPATH build -dnl during 'make distclean'. -dnl TODO avoid the shell variable once automake is fixed. -GNUmakefile=GNUmakefile -m4_if(m4_version_compare([2.61a.100], - m4_defn([m4_PACKAGE_VERSION])), [1], [], - [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], - [GNUmakefile=$GNUmakefile])]) - AC_CONFIG_FILES( Makefile doc/Makefile |