From 21524dd9cf016bc4e4bdf88ee611579c71fe6ba8 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 6 Aug 2007 15:46:11 +0300
Subject: [PATCH] rpm is not a cross-tool...

The patch below removes AC_CANONICAL_TARGET from configure.ac and
changes $target to $host.

Background: AC_CANONICAL_TARGET is supposed to take the target of a
cross-tool, not the target of cross-compiling a package
(== a configure script's --host).

Patch from Ralf Corsepius
---
 configure.ac | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6af3d39..09dc806 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.61)
 AC_INIT(rpm, 4.4.90, rpm-maint@lists.rpm.org)
-AC_CANONICAL_TARGET
+
 AC_CONFIG_SRCDIR([rpmqv.c])
 AM_CONFIG_HEADER([config.h])
 
@@ -90,7 +90,7 @@ dnl	LDFLAGS_STATIC=""
 dnl
 AC_MSG_CHECKING(flag used by libtool to link rpm)
 if test X"$GCC" = Xyes ; then
-	case "$target" in
+	case "$host" in
 		*-*-linux*)	LDFLAGS_STATIC="-all-static" ;;
 		*-*-solaris*)	LDFLAGS_STATIC="-static";;
 		*-*-hpux*)	LDFLAGS_STATIC="-static";;
@@ -99,7 +99,7 @@ if test X"$GCC" = Xyes ; then
 		*-*-*)		LDFLAGS_STATIC="";;
 	esac
 elif test X"$CC" = Xcc ; then
-	case "$target" in
+	case "$host" in
 		*-*-linux*)	LDFLAGS_STATIC="-all-static";;
 		*-*-freebsd*)	LDFLAGS_STATIC="-all-static";;
 		*-*-osf*)	LDFLAGS_STATIC="";; # OSF5 has no shared pthreads libs
@@ -275,7 +275,7 @@ AC_PATH_PROG(__STRIP, strip, /usr/bin/strip, $MYPATH)
 addlib() {
   l=$1
   shift
-  case "$target" in 
+  case "$host" in 
     *-*-solaris*)	LIBS="$LIBS -L$l -R$l $*";;
     *)		LIBS="$LIBS -L$l $*";;
   esac
@@ -611,7 +611,7 @@ AC_SUBST(DBLIBSRCS)
 AC_SUBST(DBLIBOBJS)
 
 dnl AmigaOS and IXEmul have a fork() dummy
-  case "$target" in
+  case "$host" in
     m68k-*-amigaos ) 
 	echo "Building for AmigaOS: using vfork() instead of fork()"; 
 	CFLAGS="$CFLAGS -Dfork=vfork" 
@@ -892,7 +892,7 @@ fi
 
 WITH_SELINUX_LIB=
 with_selinuxval=no
-case "$target" in
+case "$host" in
     *-*-linux*) with_selinuxval=yes ;;
 esac
 withval=${with_selinuxval}
-- 
2.7.4