Commit b2266bee1cc3c02a79af7267bc80115597c8fc8d
Committed by
Anthony Liguori
1 parent
ac119f9d
Define and use xen libs in a single place
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Showing
1 changed file
with
8 additions
and
7 deletions
configure
| ... | ... | @@ -874,16 +874,17 @@ fi |
| 874 | 874 | # xen probe |
| 875 | 875 | |
| 876 | 876 | if test "$xen" = "yes" ; then |
| 877 | -cat > $TMPC <<EOF | |
| 877 | + xen_libs="-lxenstore -lxenctrl -lxenguest" | |
| 878 | + cat > $TMPC <<EOF | |
| 878 | 879 | #include <xenctrl.h> |
| 879 | 880 | #include <xs.h> |
| 880 | 881 | int main(void) { xs_daemon_open(); xc_interface_open(); return 0; } |
| 881 | 882 | EOF |
| 882 | - if $cc $CFLAGS $ARCH_CFLAGS -c -o $TMPO $TMPC $LDFLAGS -lxenstore -lxenctrl 2> /dev/null > /dev/null ; then | |
| 883 | - : | |
| 884 | - else | |
| 885 | - xen="no" | |
| 886 | - fi | |
| 883 | + if $cc $CFLAGS $ARCH_CFLAGS -c -o $TMPO $TMPC $LDFLAGS $xen_libs 2> /dev/null > /dev/null ; then | |
| 884 | + : | |
| 885 | + else | |
| 886 | + xen="no" | |
| 887 | + fi | |
| 887 | 888 | fi |
| 888 | 889 | |
| 889 | 890 | ########################################## |
| ... | ... | @@ -1691,7 +1692,7 @@ if test "$bluez" = "yes" ; then |
| 1691 | 1692 | echo "#define CONFIG_BLUEZ 1" >> $config_host_h |
| 1692 | 1693 | fi |
| 1693 | 1694 | if test "$xen" = "yes" ; then |
| 1694 | - echo "XEN_LIBS=-lxenstore -lxenctrl -lxenguest" >> $config_host_mak | |
| 1695 | + echo "XEN_LIBS=$xen_libs" >> $config_host_mak | |
| 1695 | 1696 | fi |
| 1696 | 1697 | if test "$aio" = "yes" ; then |
| 1697 | 1698 | echo "#define CONFIG_AIO 1" >> $config_host_h | ... | ... |