From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MUPYd-0005pt-FG
	for qemu-devel@nongnu.org; Fri, 24 Jul 2009 14:31:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MUPYW-0005kE-E6
	for qemu-devel@nongnu.org; Fri, 24 Jul 2009 14:31:48 -0400
Received: from [199.232.76.173] (port=55226 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MUPYW-0005k2-6M
	for qemu-devel@nongnu.org; Fri, 24 Jul 2009 14:31:44 -0400
Received: from mx2.redhat.com ([66.187.237.31]:53538)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <quintela@redhat.com>) id 1MUPYV-0001NL-Jb
	for qemu-devel@nongnu.org; Fri, 24 Jul 2009 14:31:43 -0400
From: Juan Quintela <quintela@redhat.com>
Date: Fri, 24 Jul 2009 20:30:38 +0200
Message-Id: <b43af56b3542b19fdae2af744a70ec87d3dabf39.1248459711.git.quintela@redhat.com>
In-Reply-To: <cover.1248459711.git.quintela@redhat.com>
References: <cover.1248459711.git.quintela@redhat.com>
In-Reply-To: <cover.1248459711.git.quintela@redhat.com>
References: <cover.1248459711.git.quintela@redhat.com>
Subject: [Qemu-devel] [PATCH 38/46] simplify brlapi selection
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

Use same style that everythnig else

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile  |    4 +---
 configure |   18 ++++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index a53b630..ed9a08d 100644
--- a/Makefile
+++ b/Makefile
@@ -100,9 +100,7 @@ obj-y += qdev.o qdev-properties.o ssi.o

 obj-$(CONFIG_BRLAPI) += baum.o

-ifdef CONFIG_BRLAPI
-LIBS+=-lbrlapi
-endif
+LIBS+=$(BRLAPI_LIBS)

 obj-$(CONFIG_WIN32) += tap-win32.o
 obj-$(CONFIG_POSIX) += migration-exec.o
diff --git a/configure b/configure
index 3b0fb72..32ed1ec 100755
--- a/configure
+++ b/configure
@@ -159,6 +159,7 @@ case "$cpu" in
     cpu="unknown"
   ;;
 esac
+brlapi="yes"
 gprof="no"
 debug_tcg="no"
 debug="no"
@@ -1084,16 +1085,17 @@ done
 ##########################################
 # BrlAPI probe

-if test -z "$brlapi" ; then
-    brlapi=no
-cat > $TMPC << EOF
+if test "$brlapi" = "yes" ; then
+  brlapi=no
+  brlapi_libs="-lbrlapi"
+  cat > $TMPC << EOF
 #include <brlapi.h>
 int main( void ) { return brlapi__openConnection (NULL, NULL, NULL); }
 EOF
-    if $cc ${ARCH_CFLAGS} -o $TMPE ${OS_CFLAGS} $TMPC -lbrlapi > /dev/null 2> /dev/null ; then
-	    brlapi=yes
-    fi # brlapi compile test
-fi # -z $brlapi
+  if $cc ${ARCH_CFLAGS} -o $TMPE ${OS_CFLAGS} $TMPC $brlapi_libs > /dev/null 2> /dev/null ; then
+    brlapi=yes
+  fi
+fi

 ##########################################
 # curses probe
@@ -1678,7 +1680,7 @@ fi
 if test "$brlapi" = "yes" ; then
   echo "CONFIG_BRLAPI=y" >> $config_host_mak
   echo "#define CONFIG_BRLAPI 1" >> $config_host_h
-  echo "BRLAPI_LIBS=-lbrlapi" >> $config_host_mak
+  echo "BRLAPI_LIBS=$brlapi_libs" >> $config_host_mak
 fi
 if test "$bluez" = "yes" ; then
   echo "CONFIG_BLUEZ=y" >> $config_host_mak
-- 
1.6.2.5