From 86876c30e19d9b2c699bdff44f5156b9afe6adcf Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Tue, 1 Dec 2009 19:05:44 +0000
Subject: [PATCH] Use dlltool from the in-tree mingw installation We only use
 dlltool on Windows, and this way we don't require that the
 user has it installed.

---
 configure.ac    |   15 ---------------
 mk/config.mk.in |    2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index c249b9a..2e87ea5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -437,21 +437,6 @@ FP_ARG_WITH_PATH_GNU_PROG([LD], [ld])
 LdCmd="$LD"
 AC_SUBST([LdCmd])
 
-dnl ** Check for dlltool on Windows
-dnl --------------------------------------------------------------
-case $HostOS_CPP in
-cygwin32|mingw32)
-	AC_PATH_PROG(DlltoolCmd,dlltool)
-	if test -z "$DlltoolCmd"; then
-	  echo "Can't find dlltool in your path, can't make DLLs."
-	  exit 1
-	fi
-	;;
-*)
-	AC_SUBST(DlltoolCmd,"")
-	;;
-esac
-
 dnl ** Which nm to use?
 dnl --------------------------------------------------------------
 FP_ARG_WITH_PATH_GNU_PROG([NM], [nm])
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 4431dd8..07b0c79 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -550,7 +550,7 @@ SRC_HSC2HS_OPTS += $(foreach d,$(GMP_INCLUDE_DIRS),-I$(d))
 # Mingwex Library
 #
 HaveLibMingwEx	= @HaveLibMingwEx@
-DLLTOOL			= @DlltoolCmd@
+DLLTOOL			= inplace/mingw/bin/dlltool.exe
 
 #-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)
-- 
1.7.10.4