This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] tst-fanotify: switch to AC_DEFINE
- From: Mike Frysinger <vapier at gentoo dot org>
- To: libc-alpha at sourceware dot org
- Date: Tue, 31 Dec 2013 11:39:10 -0500
- Subject: [PATCH] tst-fanotify: switch to AC_DEFINE
- Authentication-results: sourceware.org; auth=none
- References: <Pine dot LNX dot 4 dot 64 dot 1312311554490 dot 15242 at digraph dot polyomino dot org dot uk>
Reported-by: Joseph S. Myers <joseph@codesourcery.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
ChangeLog | 7 +++++++
config.h.in | 3 +++
sysdeps/unix/sysv/linux/configure | 3 ++-
sysdeps/unix/sysv/linux/configure.ac | 2 +-
sysdeps/unix/sysv/linux/tst-fanotify.c | 1 +
5 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d2c23e7..9545ed9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2013-12-31 Mike Frysinger <vapier@gentoo.org>
+ * config.h.in: Add HAVE_LINUX_FANOTIFY_H template.
+ * sysdeps/unix/sysv/linux/configure: Regenerated.
+ * sysdeps/unix/sysv/linux/configure.ac: Call AC_DEFINE.
+ * sysdeps/unix/sysv/linux/tst-fanotify.c: Include config.h.
+
+2013-12-31 Mike Frysinger <vapier@gentoo.org>
+
* sysdeps/unix/sysv/linux/configure: Regenerated.
* sysdeps/unix/sysv/linux/configure.ac: Call AC_CHECK_HEADER on
the linux/fanotify.h header.
diff --git a/config.h.in b/config.h.in
index f6151c5..40797e7 100644
--- a/config.h.in
+++ b/config.h.in
@@ -192,6 +192,9 @@
/* Define if STT_GNU_IFUNC support actually works. */
#undef HAVE_IFUNC
+/* Define if linux/fanotify.h is available. */
+#undef HAVE_LINUX_FANOTIFY_H
+
/*
*/
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index ab0f03c..d5ee4ef 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -303,7 +303,8 @@ fi
ac_fn_c_check_header_compile "$LINENO" "linux/fanotify.h" "ac_cv_header_linux_fanotify_h" "/* No default includes. */
"
if test "x$ac_cv_header_linux_fanotify_h" = xyes; then :
- DEFINES="$DEFINES -DHAVE_LINUX_FANOTIFY_H=1"
+ $as_echo "#define HAVE_LINUX_FANOTIFY_H 1" >>confdefs.h
+
fi
diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac
index 6d6053f..90cbf48 100644
--- a/sysdeps/unix/sysv/linux/configure.ac
+++ b/sysdeps/unix/sysv/linux/configure.ac
@@ -108,7 +108,7 @@ fi
# Until we start requiring 2.6.37+ headers, we need to check for the
# availability of linux/fanotify.h for testing purposes.
AC_CHECK_HEADER(linux/fanotify.h,
- [DEFINES="$DEFINES -DHAVE_LINUX_FANOTIFY_H=1"], ,
+ [AC_DEFINE(HAVE_LINUX_FANOTIFY_H)], ,
[/* No default includes. */])
# The result of the above test for the use of the FDE code is invalid if
diff --git a/sysdeps/unix/sysv/linux/tst-fanotify.c b/sysdeps/unix/sysv/linux/tst-fanotify.c
index 7b27545..43d1690 100644
--- a/sysdeps/unix/sysv/linux/tst-fanotify.c
+++ b/sysdeps/unix/sysv/linux/tst-fanotify.c
@@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#include <config.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
--
1.8.4.3