From: Jim Meyering <meyering@redhat.com>
Date: Tue, 4 Mar 2008 11:56:45 +0000 (+0100)
Subject: Comment out yesterday's VPATH-friendly addition, for now.
X-Git-Tag: v6.11~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87a2903cca46103b31ed24a747af5e69a542a925;p=thirdparty%2Fcoreutils.git

Comment out yesterday's VPATH-friendly addition, for now.

* configure.ac: ...while we wait for a fixed version of automake.
---

diff --git a/configure.ac b/configure.ac
index 7b3f7de29d..f23d09689e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,8 +337,13 @@ 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.
-m4_if(m4_version_compare([2.61a.100], m4_defn([m4_PACKAGE_VERSION])), [1], [],
-      [AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])])
+
+dnl Disabled for now, since this would cause "make distclean" to
+dnl remove the sole copy of the file in a non-VPATH build.
+dnl TODO restore once automake has been fixed to do the right thing.
+dnl m4_if(m4_version_compare([2.61a.100],
+dnl       m4_defn([m4_PACKAGE_VERSION])), [1], [],
+dnl       [AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])])
 
 AC_CONFIG_FILES(
   Makefile