[systemd-commits] configure.ac src/shared

[Lennart Poettering]

 configure.ac         |    7 ++++---
 src/shared/missing.h |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 9388e99e208a6487b26dcbda86005ee9eba8d93d
Author: Michael Olbrich <m.olbrich at pengutronix.de>
Date:   Tue Oct 9 14:58:51 2012 +0200

    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 09818d6..fe8137d 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 14abe4e..1a31066 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;