From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Tue, 9 Oct 2012 12:58:51 +0000 (+0200)
Subject: build-sys: check for name_to_handle_at declaration instead of its definition
X-Git-Tag: v195~106
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9388e99e208a6487b26dcbda86005ee9eba8d93d;hp=7e505069d2eac61406cb0e7a9e5ef54a3c1ec38d;p=elogind.git

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.
---

diff --git a/configure.ac b/configure.ac
index 09818d6ec..fe8137d81 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 14abe4ee2..1a3106603 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;