[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 39/47] simplify brlapi selection
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 39/47] simplify brlapi selection |
Date: |
Mon, 27 Jul 2009 16:13:18 +0200 |
Use same style that everythnig else
Signed-off-by: Juan Quintela <address@hidden>
---
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 4760b47..73ee5d6 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
- [Qemu-devel] [PATCH 28/47] Add CONFIG_POSIX, (continued)
- [Qemu-devel] [PATCH 28/47] Add CONFIG_POSIX, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 27/47] rename WORDS_BIGENDIAN to HOST_WORDS_BIGENDIAN, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 30/47] the else part of this test is obsolete We are testing for sdl = yes inside the else part of the test if sdl = yes, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 33/47] instead of setup sdl_x11 just add -lX11 to sdl_libs, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 29/47] Use CONFIG_POSIX to simplify Makefile, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 32/47] Calculate sdl_libs and sdl_flags and use them everywhere, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 31/47] sdl_config value was always sdl-config, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 37/47] Define and use xen libs in a single place, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 36/47] indent with 2 spaces sdl tests, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 38/47] simplify curses library selection, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 39/47] simplify brlapi selection,
Juan Quintela <=
- [Qemu-devel] [PATCH 35/47] remove sdl_static. Just do the right thing if static is yes, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 34/47] target_softmmu is undefined at that point, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 40/47] simplify vde libs selection, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 41/47] simplify fdt libs selection, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 42/47] test if xen is enabled only once, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 46/47] Generate config-host.h from config-host.mak, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 45/47] rename USE_NPTL to CONFIG_USE_NPTL, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 43/47] define ENOTSUP the same that the other errors, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 44/47] rename NEEDS_LIBSUNMATH to CONFIG_NEEDS_LIBSUNMATH, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 47/47] move on_vcpu inside proper #ifdef, Juan Quintela, 2009/07/27