From aac9e56759350e5466afb025c434c435c9ebb125 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Thu, 13 Mar 2014 08:34:45 +0100
Subject: [PATCH] Fix hardware detection on aix.

---
 configure | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 3d1b035b77..06a5a70026 100755
--- a/configure
+++ b/configure
@@ -2505,14 +2505,18 @@ windres_default="windres"
 
 nogas=":"
 
-# machine
-arch_default=$(uname -m)
-cpu="generic"
-
 # OS
 target_os_default=$(tolower $(uname -s))
 host_os=$target_os_default
 
+# machine
+if test "$target_os_default" = aix; then
+    arch_default=$(uname -p)
+else
+    arch_default=$(uname -m)
+fi
+cpu="generic"
+
 # configurable options
 enable $PROGRAM_LIST
 enable $DOCUMENT_LIST