From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MXwyn-00035D-F4
	for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MXwyg-000312-3K
	for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:26 -0400
Received: from [199.232.76.173] (port=51641 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MXwyf-00030e-5G
	for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:21 -0400
Received: from mx2.redhat.com ([66.187.237.31]:40751)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <quintela@redhat.com>) id 1MXwye-0006qO-EZ
	for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:20 -0400
From: Juan Quintela <quintela@redhat.com>
Date: Mon,  3 Aug 2009 14:45:58 +0200
Message-Id: <de60f967fa5103189f2aaa3780ab02a79f33e93d.1249301360.git.quintela@redhat.com>
In-Reply-To: <cover.1249301360.git.quintela@redhat.com>
References: <cover.1249301360.git.quintela@redhat.com>
In-Reply-To: <cover.1249301360.git.quintela@redhat.com>
References: <cover.1249301360.git.quintela@redhat.com>
Subject: [Qemu-devel] [PATCH 07/81] move checks for bswap32/bswap_32 sooner
	than starting of printing variables
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com


Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 configure |   44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index 9f6ce79..3b46695 100755
--- a/configure
+++ b/configure
@@ -1374,6 +1374,28 @@ if test "$build_docs" = "yes" -a \( ! -x "`which texi2html 2>/dev/null`" -o ! -x
   build_docs="no"
 fi

+# Search for bsawp_32 function
+byteswap_h=no
+cat > $TMPC << EOF
+#include <byteswap.h>
+int main(void) { return bswap_32(0); }
+EOF
+if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
+  byteswap_h=yes
+fi
+
+# Search for bsawp_32 function
+bswap_h=no
+cat > $TMPC << EOF
+#include <sys/endian.h>
+#include <sys/types.h>
+#include <machine/bswap.h>
+int main(void) { return bswap32(0); }
+EOF
+if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
+  bswap_h=yes
+fi
+
 ##########################################
 # Do we need librt
 cat > $TMPC <<EOF
@@ -1548,22 +1570,6 @@ if test "$mingw32" = "yes" ; then
   echo "CONFIG_WIN32=y" >> $config_host_mak
 else
   echo "CONFIG_POSIX=y" >> $config_host_mak
-  cat > $TMPC << EOF
-#include <byteswap.h>
-int main(void) { return bswap_32(0); }
-EOF
-  if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
-    echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak
-  fi
-  cat > $TMPC << EOF
-#include <sys/endian.h>
-#include <sys/types.h>
-#include <machine/bswap.h>
-int main(void) { return bswap32(0); }
-EOF
-  if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
-    echo "CONFIG_MACHINE_BSWAP_H=y" >> $config_host_mak
-  fi
 fi

 if test "$darwin" = "yes" ; then
@@ -1670,6 +1676,12 @@ fi
 if test "$inotify" = "yes" ; then
   echo "CONFIG_INOTIFY=y" >> $config_host_mak
 fi
+if test "$byteswap_h" = "yes" ; then
+  echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak
+fi
+if test "$bswap_h" = "yes" ; then
+  echo "CONFIG_MACHINE_BSWAP_H=y" >> $config_host_mak
+fi
 if test "$curl" = "yes" ; then
   echo "CONFIG_CURL=y" >> $config_host_mak
   echo "CURL_LIBS=$curl_libs" >> $config_host_mak
-- 
1.6.2.5