Resolve merge conflicts, merge #229 "Add SystemdMeter" from @cgzones

This commit is contained in:
Daniel Lange
2020-11-15 14:52:25 +01:00
7 changed files with 354 additions and 2 deletions

View File

@ -90,6 +90,8 @@ AC_FUNC_CLOSEDIR_VOID
AC_FUNC_STAT
AC_CHECK_FUNCS([fstatat memmove readlinkat strdup strncasecmp strstr])
AC_SEARCH_LIBS([dlopen], [dl dld])
save_cflags="${CFLAGS}"
CFLAGS="${CFLAGS} -std=c99"
AC_MSG_CHECKING([whether cc -std=c99 option works])