External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

m4/virt-libxl: cleanup storing CFLAGS and LIBS variables

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-12-12 16:20:07 +01:00
parent 5767a2da4b
commit 7f0caf57cc
1 changed files with 9 additions and 6 deletions

15
m4/virt-driver-libxl.m4

@ -22,8 +22,6 @@ AC_DEFUN([LIBVIRT_DRIVER_ARG_LIBXL], [
]) ])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
old_LIBS="$LIBS"
old_CFLAGS="$CFLAGS"
LIBXL_LIBS="" LIBXL_LIBS=""
LIBXL_CFLAGS="" LIBXL_CFLAGS=""
LIBXL_FIRMWARE_DIR="" LIBXL_FIRMWARE_DIR=""
@ -48,6 +46,7 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
dnl The libxl driver will make use of this new parameter for specifying dnl The libxl driver will make use of this new parameter for specifying
dnl the Xen migration stream version. Specify LIBXL_API_VERSION to trigger dnl the Xen migration stream version. Specify LIBXL_API_VERSION to trigger
dnl an error if there is too old xenlight dnl an error if there is too old xenlight
old_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $LIBXL_API_VERSION" CFLAGS="$CFLAGS $LIBXL_API_VERSION"
LIBVIRT_CHECK_LIB([LIBXL], [xenlight], [libxl_ctx_alloc], [libxl.h], [fail="1"]) LIBVIRT_CHECK_LIB([LIBXL], [xenlight], [libxl_ctx_alloc], [libxl.h], [fail="1"])
CFLAGS="$old_CFLAGS" CFLAGS="$old_CFLAGS"
@ -57,11 +56,12 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
fi fi
fi fi
LIBXL_CFLAGS="$LIBXL_CFLAGS $LIBXL_API_VERSION"
LIBS="$old_LIBS"
CFLAGS="$old_CFLAGS"
if test "$with_libxl" = "yes"; then if test "$with_libxl" = "yes"; then
old_LIBS="$LIBS"
old_CFLAGS="$CFLAGS"
LIBXL_CFLAGS="$LIBXL_CFLAGS $LIBXL_API_VERSION"
dnl If building with libxl, use the libxl utility header and lib too dnl If building with libxl, use the libxl utility header and lib too
AC_CHECK_HEADERS([libxlutil.h]) AC_CHECK_HEADERS([libxlutil.h])
LIBXL_LIBS="$LIBXL_LIBS -lxlutil" LIBXL_LIBS="$LIBXL_LIBS -lxlutil"
@ -79,6 +79,9 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
],[ ],[
LIBXL_LIBS="$LIBXL_LIBS -lxenctrl" LIBXL_LIBS="$LIBXL_LIBS -lxenctrl"
]) ])
CFLAGS="$old_CFLAGS"
LIBS="$old_LIBS"
fi fi
AC_SUBST([LIBXL_CFLAGS]) AC_SUBST([LIBXL_CFLAGS])