Skip to content

Commit 5ef62af

Browse files
committed
build: Simplify configure netlink/*.h detection code
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
1 parent b826dc1 commit 5ef62af

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

configure.ac

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,32 +1021,35 @@ AC_ARG_ENABLE([delayacct],
10211021
[],
10221022
[enable_delayacct=check])
10231023
case "$enable_delayacct" in
1024-
no)
1024+
no|yes)
10251025
;;
10261026
check)
10271027
if test "$my_htop_platform" != linux; then
10281028
enable_delayacct=no
10291029
elif test "$enable_static" = yes; then
10301030
enable_delayacct=no
1031-
else
1032-
old_CFLAGS="$CFLAGS"
1033-
CFLAGS="$CFLAGS -I/usr/include/libnl3"
1034-
AC_CHECK_HEADERS([netlink/attr.h netlink/handlers.h netlink/msg.h], [], [enable_delayacct=no])
1035-
CFLAGS="$old_CFLAGS"
1036-
1037-
if test "$enable_delayacct" != no; then
1038-
enable_delayacct=yes
1039-
fi
10401031
fi
10411032
;;
1042-
yes)
1033+
*)
1034+
AC_MSG_ERROR([bad value '$enable_delayacct' for --enable-delayacct])
1035+
;;
1036+
esac
1037+
1038+
case "$enable_delayacct" in
1039+
check|yes)
10431040
old_CFLAGS="$CFLAGS"
10441041
CFLAGS="$CFLAGS -I/usr/include/libnl3"
1045-
AC_CHECK_HEADERS([netlink/attr.h netlink/handlers.h netlink/msg.h], [], [AC_MSG_ERROR([can not find required header files netlink/attr.h, netlink/handlers.h, netlink/msg.h])])
1042+
AC_CHECK_HEADERS([netlink/attr.h netlink/handlers.h netlink/msg.h],
1043+
[],
1044+
[if test "$enable_delayacct" = yes; then
1045+
AC_MSG_ERROR([can not find required header files netlink/attr.h, netlink/handlers.h, netlink/msg.h])
1046+
fi
1047+
enable_delayacct=no])
10461048
CFLAGS="$old_CFLAGS"
1047-
;;
1048-
*)
1049-
AC_MSG_ERROR([bad value '$enable_delayacct' for --enable-delayacct])
1049+
1050+
if test "$enable_delayacct" != no; then
1051+
enable_delayacct=yes
1052+
fi
10501053
;;
10511054
esac
10521055
if test "$enable_delayacct" = yes; then

0 commit comments

Comments
 (0)