@@ -1133,17 +1133,11 @@ case "$enable_hwloc" in
11331133 no)
11341134 ;;
11351135 yes)
1136- m4_ifdef (
1137- [ PKG_PROG_PKG_CONFIG] ,
1136+ HTOP_PKG_CHECK_MODULES(HWLOC, hwloc,
11381137 [
1139- PKG_CHECK_MODULES(HWLOC, hwloc, [
1140- AM_CFLAGS="$AM_CFLAGS $HWLOC_CFLAGS"
1141- LIBS="$LIBS $HWLOC_LIBS"
1142- AC_DEFINE ( [ HAVE_LIBHWLOC] , [ 1] , [ Define to 1 if you have the 'hwloc' library (-lhwloc).] )
1143- ] , [
1144- AC_CHECK_LIB ( [ hwloc] , [ hwloc_get_proc_cpubind] , [ ] , [ AC_MSG_ERROR ( [ can not find required library libhwloc] ) ] )
1145- AC_CHECK_HEADERS ( [ hwloc.h] , [ ] , [ AC_MSG_ERROR ( [ can not find require header file hwloc.h] ) ] )
1146- ] )
1138+ AM_CFLAGS="$AM_CFLAGS $HWLOC_CFLAGS"
1139+ LIBS="$LIBS $HWLOC_LIBS"
1140+ AC_DEFINE ( [ HAVE_LIBHWLOC] , [ 1] , [ Define to 1 if you have the 'hwloc' library (-lhwloc).] )
11471141 ] , [
11481142 AC_CHECK_LIB ( [ hwloc] , [ hwloc_get_proc_cpubind] , [ ] , [ AC_MSG_ERROR ( [ can not find required library libhwloc] ) ] )
11491143 AC_CHECK_HEADERS ( [ hwloc.h] , [ ] , [ AC_MSG_ERROR ( [ can not find require header file hwloc.h] ) ] )
@@ -1338,11 +1332,7 @@ esac
13381332case "$enable_delayacct" in
13391333 check|yes)
13401334 if test "x${LIBNL3_CFLAGS+y}" = x; then
1341- m4_ifdef (
1342- [ PKG_PROG_PKG_CONFIG] ,
1343- [ PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [ ] , [ LIBNL3_CFLAGS="-I/usr/include/libnl3"] )] ,
1344- [ LIBNL3_CFLAGS="-I/usr/include/libnl3"]
1345- )
1335+ HTOP_PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [ ] , [ LIBNL3_CFLAGS="-I/usr/include/libnl3"] )
13461336 fi
13471337
13481338 htop_save_CFLAGS=$CFLAGS
0 commit comments