diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-09-04 07:42:12 -0700 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-11-19 11:05:17 +0000 |
| commit | 1b0e79cb43342f40bc51663a26d99e1d56966147 (patch) | |
| tree | 00a480446f236bacc0384c8de6e0fe144d479fc5 /configure.ac | |
| parent | 2908a4da6a4da4d3c86839730808a6a79a2e73e4 (diff) | |
| download | dbus-1b0e79cb43342f40bc51663a26d99e1d56966147.tar.gz | |
build: Simplify checks for functions with no special dependencies
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 89337836..0e8045ff 100644 --- a/configure.ac +++ b/configure.ac @@ -389,6 +389,40 @@ AS_IF([test x$enable_code_coverage = xyes],[ [Defined if gcov is enabled to force a rebuild due to config.h changing]) ]) +#### Simple checks for things with no special dependencies + +# This construct is only suitable for functions that are in the system's +# standard C library and do not have unusual dependencies. Other +# functions need their own checks. Please keep sorted in LC_ALL=C order +AC_CHECK_FUNCS_ONCE([ +accept4 +clearenv +fpathconf +getgrouplist +getpeereid +getpeerucred +getresuid +getrlimit +inotify_init1 +issetugid +localeconv +nanosleep +pipe2 +poll +prctl +prlimit +raise +setenv +setlocale +setresuid +setrlimit +socketpair +strtoll +strtoull +unsetenv +usleep +]) + #### Integer sizes AC_CHECK_SIZEOF(char) @@ -622,8 +656,6 @@ AC_DEFINE_UNQUOTED([DBUS_USE_SYNC], [$have_sync], [Use the gcc __sync extension] AC_SEARCH_LIBS(socket,[socket network]) AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) -AC_CHECK_FUNCS([nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull issetugid getresuid setresuid getrlimit prlimit]) - AC_CHECK_HEADERS([syslog.h]) if test "x$ac_cv_header_syslog_h" = "xyes"; then AC_CHECK_DECLS([LOG_PERROR], [], [], [[#include <syslog.h>]]) @@ -631,7 +663,6 @@ fi # For test-segfault.c AC_CHECK_HEADERS_ONCE([sys/prctl.h]) -AC_CHECK_FUNCS_ONCE([prctl raise]) AC_MSG_CHECKING(for dirfd) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ @@ -800,10 +831,6 @@ AC_CHECK_MEMBER([struct unpcbid.unp_pid], [], [[#include <sys/un.h>]]) -AC_CHECK_FUNCS(getpeerucred getpeereid) - -AC_CHECK_FUNCS(pipe2 accept4) - PKG_CHECK_MODULES([EXPAT], [expat]) save_cflags="$CFLAGS" @@ -949,7 +976,6 @@ fi dnl check if inotify backend is enabled if test x$have_inotify = xyes; then AC_DEFINE(DBUS_BUS_ENABLE_INOTIFY,1,[Use inotify]) - AC_CHECK_FUNCS(inotify_init1) fi AM_CONDITIONAL(DBUS_BUS_ENABLE_INOTIFY, test x$have_inotify = xyes) |