From f62aebb863312b624aec0ebef304a0bdb362e77b Mon Sep 17 00:00:00 2001 From: Alexander Aring Date: Thu, 3 Apr 2014 09:30:13 +0200 Subject: [PATCH] powertop: add --enable-pci argument Signed-off-by: Alexander Aring --- configure.ac | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index b69d608..27c01af 100644 --- a/configure.ac +++ b/configure.ac @@ -48,10 +48,29 @@ AC_CHECK_FUNCS([fdatasync getpagesize gettimeofday memmove memset mkdir munmap p AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], AC_MSG_ERROR([ncurses is required but was not found]), []) -has_libpci=0 -PKG_CHECK_MODULES([PCIUTILS], [libpci],[has_libpci=1],[ - AC_SEARCH_LIBS([pci_get_dev], [pci],[has_libpci=1], [has_libpci=0] )]) - +AC_ARG_ENABLE([pci], + AS_HELP_STRING([--enable-pci], [enable pci support @<:@default=disabled@:>@]), + [enable_pci=$enableval], [enable_pci=no]) +AS_IF([test "x$enable_pci" = "xno"], [ + AC_DEFINE(HAVE_NO_PCI, [1], [pci support.]) +]) + +if (test "$enable_pci" == "yes"); then + has_libpci=0 + PKG_CHECK_MODULES([PCIUTILS], [libpci],[has_libpci=1],[ + AC_SEARCH_LIBS([pci_get_dev], [pci],[has_libpci=1], [has_libpci=0])]) + + if (test "$has_libpci" -eq 0); then + AC_DEFINE([HAVE_NO_PCI],[1],[Define if pci is not supported]) + AC_MSG_ERROR([ + ************* LIBPCI SUPPORT NOT CONFIGURED************** + If you need pci support, please install libpci and + re-configure PowerTOP with --enable-pci or disable pci + support with --disable-pci. + ********************************************************* + ]) + fi +fi has_libnl_ver=0 # libnl-2 provides only libnl-2.0.pc file, so we check for separate libnl-genl-3.0.pc @@ -67,16 +86,6 @@ if (test "$has_libnl_ver" -gt 1); then AC_DEFINE([HAVE_LIBNL20], [1], [Define if you have libnl-2.0 or higher]) fi -if (test "$has_libpci" -eq 0); then - AC_DEFINE([HAVE_NO_PCI],[1],[Define if pci is not supported]) - AC_MSG_WARN([ - ************* LIBPCI SUPPORT NOT CONFIGURED************** - If you need or want pci support, please install libpci - and re-configure PowerTOP. - ********************************************************* - ]) -fi - AC_SEARCH_LIBS([pthread_create], [pthread], [], AC_MSG_ERROR([libpthread is required but was not found]), []) AC_SEARCH_LIBS([inet_aton], [resolv], [], AC_MSG_ERROR([libresolv is required but was not found]), []) -- 1.9.1