OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Juan Quintela 2009-07-27 16:13:18 +02:00 committed by Anthony Liguori
parent e0b7a42bc9
commit eb82284f18
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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

18
configure vendored
View File

@ -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