From 5cb4326ac590659e38d5dc1b960b680e99484736 Mon Sep 17 00:00:00 2001
From: gord <gord@localhost>
Date: Tue, 2 Mar 1999 02:41:04 +0000
Subject: [PATCH] Last few niggly configure details to fix for 0.5.90

---
 ChangeLog    | 4 ++++
 acinclude.m4 | 6 ++++--
 aclocal.m4   | 6 ++++--
 configure    | 8 +++++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7195680b7..64ef9675e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-03-01  Gordon Matzigkeit  <gord@trick.fig.org>
 
+	* acinclude.m4 (grub_OBJCOPY_ABSOLUTE): Don't forget to move the
+	old binary out of the way before reentering the loop.
+	(grub_ASM_ADDR32): Delete conftest files after running the test.
+
 	* debian/rules (binary-arch): Remove empty /sbin directory until
 	/sbin/grub is installed.  Use $(DESTDIR) instead of $(prefix) to
 	install files.
diff --git a/acinclude.m4 b/acinclude.m4
index 0791c8be8..3090c8674 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -65,7 +65,8 @@ for link_addr in 2000 8000 7C00; do
   else
     AC_MSG_ERROR([${OBJCOPY-objcopy} cannot create binary files])
   fi
-  if test ! -f conftest.old || AC_TRY_COMMAND([cmp -s conftest.old conftest]); then :
+  if test ! -f conftest.old || AC_TRY_COMMAND([cmp -s conftest.old conftest]); then
+    mv -f conftest conftest.old
   else
     grub_cv_prog_objcopy_absolute=no
     break
@@ -101,5 +102,6 @@ if AC_TRY_COMMAND([${CC-cc} -c conftest.s]) && test -s conftest.o; then
   grub_cv_asm_addr32=yes
 else
   grub_cv_asm_addr32=no
-fi])
+fi
+rm -f conftest*])
 AC_MSG_RESULT([$grub_cv_asm_addr32])])
diff --git a/aclocal.m4 b/aclocal.m4
index 19269befb..774945416 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -77,7 +77,8 @@ for link_addr in 2000 8000 7C00; do
   else
     AC_MSG_ERROR([${OBJCOPY-objcopy} cannot create binary files])
   fi
-  if test ! -f conftest.old || AC_TRY_COMMAND([cmp -s conftest.old conftest]); then :
+  if test ! -f conftest.old || AC_TRY_COMMAND([cmp -s conftest.old conftest]); then
+    mv -f conftest conftest.old
   else
     grub_cv_prog_objcopy_absolute=no
     break
@@ -113,7 +114,8 @@ if AC_TRY_COMMAND([${CC-cc} -c conftest.s]) && test -s conftest.o; then
   grub_cv_asm_addr32=yes
 else
   grub_cv_asm_addr32=no
-fi])
+fi
+rm -f conftest*])
 AC_MSG_RESULT([$grub_cv_asm_addr32])])
 
 # Do all the work for Automake.  This macro actually does too much --
diff --git a/configure b/configure
index 7950463d6..e118a3336 100644
--- a/configure
+++ b/configure
@@ -1252,7 +1252,8 @@ for link_addr in 2000 8000 7C00; do
   else
     { echo "configure: error: ${OBJCOPY-objcopy} cannot create binary files" 1>&2; exit 1; }
   fi
-  if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
+  if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+    mv -f conftest conftest.old
   else
     grub_cv_prog_objcopy_absolute=no
     break
@@ -1268,7 +1269,7 @@ fi
 
 
 echo $ac_n "checking for .code16 addr32 assembler support""... $ac_c" 1>&6
-echo "configure:1272: checking for .code16 addr32 assembler support" >&5
+echo "configure:1273: checking for .code16 addr32 assembler support" >&5
 if eval "test \"`echo '$''{'grub_cv_asm_addr32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1278,11 +1279,12 @@ l1:	addr32
 	movb	%al, l1
 EOF
 
-if { ac_try='${CC-cc} -c conftest.s'; { (eval echo configure:1282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
+if { ac_try='${CC-cc} -c conftest.s'; { (eval echo configure:1283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
   grub_cv_asm_addr32=yes
 else
   grub_cv_asm_addr32=no
 fi
+rm -f conftest*
 fi
 
 echo "$ac_t""$grub_cv_asm_addr32" 1>&6