diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-07-27 16:13:18 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-27 14:09:23 -0500 |
| commit | eb82284f180196f911fd70ebf0cddfbfdf5af3e3 (patch) | |
| tree | d9d845bf7ec4d58c5ffac37379acf9f7e7be622e | |
| parent | e0b7a42bc9e9272c8263bf8b1af5ee89b7164d3d (diff) | |
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-- | Makefile | 4 | ||||
| -rwxr-xr-x | configure | 18 |
2 files changed, 11 insertions, 11 deletions
@@ -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 @@ -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 |