From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VwqfY-0004JM-2l for mharc-grub-devel@gnu.org; Sat, 28 Dec 2013 04:58:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VwqfN-0004IS-K5 for grub-devel@gnu.org; Sat, 28 Dec 2013 04:58:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VwqfF-0003S2-7i for grub-devel@gnu.org; Sat, 28 Dec 2013 04:58:45 -0500 Received: from mail-la0-x235.google.com ([2a00:1450:4010:c03::235]:38785) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VwqfE-0003Ru-W7 for grub-devel@gnu.org; Sat, 28 Dec 2013 04:58:37 -0500 Received: by mail-la0-f53.google.com with SMTP id mc6so4619887lab.40 for ; Sat, 28 Dec 2013 01:58:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=78HoDuU3AROr0EhQ7vatnkuB6Ps6vkPDgivPJUDAWcE=; b=Il2iQ0Ae83hw/7phjaGUR54tXu4dkzLz6RZJ36h9KFndbB1xT6rYcHlGPYM8cBDj58 CtJRPNyDU7a+aI3bg/E8thQvBaHVILEJQJKt++pyiUXpAN+yrTYTlfg2wvaBdWBaLgql j3n3fsO0Po+AER4nTcxbhkOoE3GcVm7oAfkoU5/2QNWFflSACNvlM0jAk6LabeWI4zYq L9UW9s3YIjpJkL0RL8CCgXOKr7//BUo3fWHKAd6EJSLxGLVOyF4OVYA2clO75L62n6E2 h6tMRYWNPoLg7j4ov/uN+ynvBtMf1vsMlqJA5oVtfer8kzlXH5uoOeiKI4lup3wggoga CldA== X-Received: by 10.152.197.67 with SMTP id is3mr5208789lac.61.1388224715825; Sat, 28 Dec 2013 01:58:35 -0800 (PST) Received: from localhost.localdomain (ppp91-76-134-134.pppoe.mtu-net.ru. [91.76.134.134]) by mx.google.com with ESMTPSA id tc8sm23000047lbb.9.2013.12.28.01.58.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Dec 2013 01:58:35 -0800 (PST) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] fix removal of {cpu,machine} links on mingw/msys Date: Sat, 28 Dec 2013 13:58:31 +0400 Message-Id: <1388224711-10010-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::235 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2013 09:58:54 -0000 At least on Windows 2003 using "ln -s dir1 dir2" in msys shell succeeds, but results in what looks like hard link. Subsequent "rm -f dir2" (e.g. during second config.status invocation) fails. Check that we also can remove link to directory. Make it more clear in message that we are checking "ln -s". --- acinclude.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 32d5477..b2bb88d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -418,15 +418,15 @@ else [fi] ]) -dnl Check if ln can handle directories properly (mingw). +dnl Check if ln -s can handle directories properly (mingw). AC_DEFUN([grub_CHECK_LINK_DIR],[ -AC_MSG_CHECKING([whether ln can handle directories properly]) +AC_MSG_CHECKING([whether ln -s can handle directories properly]) [mkdir testdir 2>/dev/null case $srcdir in [\\/$]* | ?:[\\/]* ) reldir=$srcdir/include/grub/util ;; *) reldir=../$srcdir/include/grub/util ;; esac -if ln -s $reldir testdir/util 2>/dev/null ; then] +if ln -s $reldir testdir/util 2>/dev/null && rm -f testdir/util 2>/dev/null ; then] AC_MSG_RESULT([yes]) [link_dir=yes else -- tg: (989af02..) u/mingw/dir-links (depends on: master)