summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-07-27 16:13:18 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-27 14:09:23 -0500
commiteb82284f180196f911fd70ebf0cddfbfdf5af3e3 (patch)
treed9d845bf7ec4d58c5ffac37379acf9f7e7be622e
parentsimplify curses library selection (diff)
downloadqemu-kvm-eb82284f180196f911fd70ebf0cddfbfdf5af3e3.tar.gz
qemu-kvm-eb82284f180196f911fd70ebf0cddfbfdf5af3e3.tar.bz2
qemu-kvm-eb82284f180196f911fd70ebf0cddfbfdf5af3e3.zip
simplify brlapi selection
Use same style that everythnig else Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile4
-rwxr-xr-xconfigure18
2 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index a53b63093..ed9a08d6e 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 4760b47b5..73ee5d60b 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