From f2105428e666306049418af8c6c66b1672314c95 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Wed, 15 Apr 2009 16:17:33 +0200
Subject: [PATCH] Use $host instead of $target.

---
 m4/buildsys.m4 | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/m4/buildsys.m4 b/m4/buildsys.m4
index 7843c50..0218869 100644
--- a/m4/buildsys.m4
+++ b/m4/buildsys.m4
@@ -22,19 +22,17 @@ dnl
 
 AC_DEFUN([BUILDSYS_LIB], [
 	AC_ARG_ENABLE(shared,
-		[  --disable-shared        don't build shared libraries],
-		enable_shared="$enableval")
+		AS_HELP_STRING([--disable-shared], [don't build shared libraries]))
 
-	if test x"$enableval" = x"no"; then
-		BUILDSYS_STATIC_LIB_ONLY
-	else
-		BUILDSYS_SHARED_LIB
-	fi
+	AS_IF([test x"$enable_shared" = x"no"],
+		BUILDSYS_STATIC_LIB_ONLY,
+		BUILDSYS_SHARED_LIB)
 ])
 
 AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
+	AC_REQUIRE([AC_CANONICAL_HOST])
 	AC_MSG_CHECKING(whether we need an implib)
-	case "$target" in
+	case "$host" in
 		*-*-cygwin* | *-*-mingw*)
 			AC_MSG_RESULT(yes)
 			PROG_IMPLIB_NEEDED='yes'
@@ -52,8 +50,9 @@ AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
 ])
 
 AC_DEFUN([BUILDSYS_SHARED_LIB], [
+	AC_REQUIRE([AC_CANONICAL_HOST])
 	AC_MSG_CHECKING(for shared library system)
-	case "$target" in
+	case "$host" in
 		intel-apple-*)
 			AC_MSG_RESULT([Mac OS X (Intel)])
 			LIB_CPPFLAGS='-DPIC'
@@ -146,8 +145,8 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
 ])
 
 AC_DEFUN([BUILDSYS_STATIC_LIB_ONLY], [
-	AC_PATH_PROG(AR, ar)
-	AC_PROG_RANLIB
+	AC_REQUIRE([AC_PROG_RANLIB])
+	AC_PATH_TOOL(AR, ar)
 
 	LIB_CPPFLAGS=''
 	LIB_CFLAGS=''