External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-21 19:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure: move numad check to its own file

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-12-12 13:54:35 +01:00
parent 1dec40f870
commit a02992a246
2 changed files with 61 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure.ac
View File

@ -964,34 +964,8 @@ LIBVIRT_CHECK_DTRACE
dnl numad
LIBVIRT_ARG_WITH_ALT([NUMAD], [use numad to manage CPU placement dynamically], [check])
if test "$with_numad" != "no" ; then
fail=0
AC_PATH_PROG([NUMAD], [numad], [], [$LIBVIRT_SBIN_PATH])
if test "$with_numad" = "check"; then
test "$with_numactl" = "yes" || fail=1
if test -z "$NUMAD" || test $fail = 1; then
with_numad="no"
else
with_numad="yes"
fi
else
test -z "$NUMAD" &&
AC_MSG_ERROR([You must install numad package to manage CPU and memory placement dynamically])
test "$with_numactl" = "yes" || fail=1
test $fail = 1 &&
AC_MSG_ERROR([You must install the numactl development package in order to compile and run libvirt])
fi
fi
if test "$with_numad" = "yes"; then
AC_DEFINE_UNQUOTED([HAVE_NUMAD], 1, [whether numad is available])
AC_DEFINE_UNQUOTED([NUMAD],["$NUMAD"], [Location or name of the numad program])
fi
AM_CONDITIONAL([HAVE_NUMAD], [test "$with_numad" != "no"])
LIBVIRT_ARG_NUMAD
LIBVIRT_CHECK_NUMAD
dnl
@ -1916,7 +1890,7 @@ AC_MSG_NOTICE([ Debug: $enable_debug])
AC_MSG_NOTICE([ Use -Werror: $enable_werror])
AC_MSG_NOTICE([ Warning Flags: $WARN_CFLAGS])
LIBVIRT_RESULT_DTRACE
AC_MSG_NOTICE([ numad: $with_numad])
LIBVIRT_RESULT_NUMAD
AC_MSG_NOTICE([ XML Catalog: $with_xml_catalog_file])
LIBVIRT_RESULT_INIT_SCRIPT
AC_MSG_NOTICE([ Char device locks: $with_chrdev_lock_files])

58
m4/virt-numad.m4 Normal file
View File

@ -0,0 +1,58 @@
dnl The numad binary check
dnl
dnl Copyright (C) 2016 Red Hat, Inc.
dnl
dnl This library is free software; you can redistribute it and/or
dnl modify it under the terms of the GNU Lesser General Public
dnl License as published by the Free Software Foundation; either
dnl version 2.1 of the License, or (at your option) any later version.
dnl
dnl This library is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dnl Lesser General Public License for more details.
dnl
dnl You should have received a copy of the GNU Lesser General Public
dnl License along with this library. If not, see
dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_NUMAD], [
LIBVIRT_ARG_WITH_ALT([NUMAD], [use numad to manage CPU placement dynamically],
[check])
])
AC_DEFUN([LIBVIRT_CHECK_NUMAD], [
AC_REQUIRE([LIBVIRT_CHECK_NUMACTL])
if test "$with_numad" != "no" ; then
fail=0
AC_PATH_PROG([NUMAD], [numad], [], [$LIBVIRT_SBIN_PATH])
if test "$with_numad" = "check"; then
test "$with_numactl" = "yes" || fail=1
if test -z "$NUMAD" || test $fail = 1; then
with_numad="no"
else
with_numad="yes"
fi
else
test -z "$NUMAD" &&
AC_MSG_ERROR([You must install numad package to manage CPU and memory placement dynamically])
test "$with_numactl" = "yes" || fail=1
test $fail = 1 &&
AC_MSG_ERROR([You must install the numactl development package in order to compile and run libvirt])
fi
fi
if test "$with_numad" = "yes"; then
AC_DEFINE_UNQUOTED([HAVE_NUMAD], 1, [whether numad is available])
AC_DEFINE_UNQUOTED([NUMAD],["$NUMAD"], [Location or name of the numad program])
fi
AM_CONDITIONAL([HAVE_NUMAD], [test "$with_numad" != "no"])
])
AC_DEFUN([LIBVIRT_RESULT_NUMAD], [
AC_MSG_NOTICE([ numad: $with_numad])
])