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:
parent
e0b7a42bc9
commit
eb82284f18
4
Makefile
4
Makefile
|
@ -100,9 +100,7 @@ obj-y += qdev.o qdev-properties.o ssi.o
|
||||||
|
|
||||||
obj-$(CONFIG_BRLAPI) += baum.o
|
obj-$(CONFIG_BRLAPI) += baum.o
|
||||||
|
|
||||||
ifdef CONFIG_BRLAPI
|
LIBS+=$(BRLAPI_LIBS)
|
||||||
LIBS+=-lbrlapi
|
|
||||||
endif
|
|
||||||
|
|
||||||
obj-$(CONFIG_WIN32) += tap-win32.o
|
obj-$(CONFIG_WIN32) += tap-win32.o
|
||||||
obj-$(CONFIG_POSIX) += migration-exec.o
|
obj-$(CONFIG_POSIX) += migration-exec.o
|
||||||
|
|
|
@ -159,6 +159,7 @@ case "$cpu" in
|
||||||
cpu="unknown"
|
cpu="unknown"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
brlapi="yes"
|
||||||
gprof="no"
|
gprof="no"
|
||||||
debug_tcg="no"
|
debug_tcg="no"
|
||||||
debug="no"
|
debug="no"
|
||||||
|
@ -1084,16 +1085,17 @@ done
|
||||||
##########################################
|
##########################################
|
||||||
# BrlAPI probe
|
# BrlAPI probe
|
||||||
|
|
||||||
if test -z "$brlapi" ; then
|
if test "$brlapi" = "yes" ; then
|
||||||
brlapi=no
|
brlapi=no
|
||||||
cat > $TMPC << EOF
|
brlapi_libs="-lbrlapi"
|
||||||
|
cat > $TMPC << EOF
|
||||||
#include <brlapi.h>
|
#include <brlapi.h>
|
||||||
int main( void ) { return brlapi__openConnection (NULL, NULL, NULL); }
|
int main( void ) { return brlapi__openConnection (NULL, NULL, NULL); }
|
||||||
EOF
|
EOF
|
||||||
if $cc ${ARCH_CFLAGS} -o $TMPE ${OS_CFLAGS} $TMPC -lbrlapi > /dev/null 2> /dev/null ; then
|
if $cc ${ARCH_CFLAGS} -o $TMPE ${OS_CFLAGS} $TMPC $brlapi_libs > /dev/null 2> /dev/null ; then
|
||||||
brlapi=yes
|
brlapi=yes
|
||||||
fi # brlapi compile test
|
fi
|
||||||
fi # -z $brlapi
|
fi
|
||||||
|
|
||||||
##########################################
|
##########################################
|
||||||
# curses probe
|
# curses probe
|
||||||
|
@ -1678,7 +1680,7 @@ fi
|
||||||
if test "$brlapi" = "yes" ; then
|
if test "$brlapi" = "yes" ; then
|
||||||
echo "CONFIG_BRLAPI=y" >> $config_host_mak
|
echo "CONFIG_BRLAPI=y" >> $config_host_mak
|
||||||
echo "#define CONFIG_BRLAPI 1" >> $config_host_h
|
echo "#define CONFIG_BRLAPI 1" >> $config_host_h
|
||||||
echo "BRLAPI_LIBS=-lbrlapi" >> $config_host_mak
|
echo "BRLAPI_LIBS=$brlapi_libs" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
if test "$bluez" = "yes" ; then
|
if test "$bluez" = "yes" ; then
|
||||||
echo "CONFIG_BLUEZ=y" >> $config_host_mak
|
echo "CONFIG_BLUEZ=y" >> $config_host_mak
|
||||||
|
|
Loading…
Reference in New Issue