summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2012-10-09 14:58:51 +0200
committerLennart Poettering <lennart@poettering.net>2012-10-16 01:30:29 +0200
commit9388e99e208a6487b26dcbda86005ee9eba8d93d (patch)
tree105f5bf161f868d8e0870e3b16b8968406e768ad
parent7e505069d2eac61406cb0e7a9e5ef54a3c1ec38d (diff)
build-sys: check for name_to_handle_at declaration instead of its definition
AC_CHECK_FUNCS may be successful, even though name_to_handle_at and 'struct file_handle' are not available.
-rw-r--r--configure.ac7
-rw-r--r--src/shared/missing.h2
2 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 09818d6ec0..fe8137d818 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,11 +174,12 @@ CAP_LIBS="$LIBS"
LIBS="$save_LIBS"
AC_SUBST(CAP_LIBS)
-AC_CHECK_FUNCS([fanotify_init fanotify_mark name_to_handle_at])
+AC_CHECK_FUNCS([fanotify_init fanotify_mark])
AC_CHECK_FUNCS([__secure_getenv secure_getenv])
-AC_CHECK_DECLS([gettid, pivot_root], [], [], [[#include <sys/types.h>
+AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at], [], [], [[#include <sys/types.h>
#include <unistd.h>
-#include <sys/mount.h>]])
+#include <sys/mount.h>
+#include <fcntl.h>]])
# This makes sure pkg.m4 is available.
m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
diff --git a/src/shared/missing.h b/src/shared/missing.h
index 14abe4ee2e..1a31066032 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -218,7 +218,7 @@ static inline pid_t gettid(void) {
# endif
#endif
-#ifndef HAVE_NAME_TO_HANDLE_AT
+#if !HAVE_DECL_NAME_TO_HANDLE_AT
struct file_handle {
unsigned int handle_bytes;
int handle_type;