Signed-off-by: Masatake YAMATO <yam...@redhat.com>

diff --git a/configure.ac b/configure.ac
index 18496c9..b5f0d30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,8 @@ LTP_CHECK_SYSCALL_MODIFY_LDT
 m4_include([m4/ltp-eventfd.m4])
 LTP_CHECK_SYSCALL_EVENTFD
 
+AC_CHECK_HEADERS([sys/inotify.h])
+
 AC_CHECK_HEADERS([ifaddrs.h])
 
 AC_OUTPUT
diff --git a/testcases/kernel/syscalls/inotify/Makefile 
b/testcases/kernel/syscalls/inotify/Makefile
index 46778ff..73eb227 100644
--- a/testcases/kernel/syscalls/inotify/Makefile
+++ b/testcases/kernel/syscalls/inotify/Makefile
@@ -16,18 +16,12 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-include ../utils/cond.mk
-
-
 CFLAGS += -I../../../../include -Wall
 LDLIBS += -L../../../../lib -lltp
 
 SRCS    = $(wildcard *.c)
 TARGETS = $(patsubst %.c,%,$(SRCS))
 
-HAS_SYS_INOTIFY := $(call check_header,sys/inotify.h,-DHAS_SYS_INOTIFY, )
-CFLAGS += $(HAS_SYS_INOTIFY)
-
 all: $(TARGETS)
 
 install:
diff --git a/testcases/kernel/syscalls/inotify/inotify01.c 
b/testcases/kernel/syscalls/inotify/inotify01.c
index d3179c3..65ec140 100644
--- a/testcases/kernel/syscalls/inotify/inotify01.c
+++ b/testcases/kernel/syscalls/inotify/inotify01.c
@@ -38,6 +38,7 @@
  *     not support it. Ricardo Salveti de Araujo <rsalv...@linux.vnet.ibm.com>
  *
  */
+#include "config.h"
 
 #include <stdio.h>
 #include <sys/stat.h>
@@ -49,7 +50,7 @@
 #include "test.h"
 #include "usctest.h"
 
-#if defined(HAS_SYS_INOTIFY) && defined(__NR_inotify_init)
+#if defined(HAVE_SYS_INOTIFY) && defined(__NR_inotify_init)
 #include <sys/inotify.h>
 
 #define EVENT_MAX 1024
@@ -332,7 +333,7 @@ main()
     tst_resm(TWARN, "Inotify syscall can be found at kernel 2.6.13 or 
higher.");
     return 0;
 #endif
-#ifndef HAS_SYS_INOTIFY
+#ifndef HAVE_SYS_INOTIFY
     tst_resm(TBROK, "can't find header sys/inotify.h");
     return 1;
 #endif
diff --git a/testcases/kernel/syscalls/inotify/inotify02.c 
b/testcases/kernel/syscalls/inotify/inotify02.c
index dbf3d87..c657d62 100644
--- a/testcases/kernel/syscalls/inotify/inotify02.c
+++ b/testcases/kernel/syscalls/inotify/inotify02.c
@@ -42,6 +42,8 @@
  *
  * ***************************************************************************/
 
+#include "config.h"
+
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -52,7 +54,7 @@
 #include "test.h"
 #include "usctest.h"
 
-#if defined(__NR_inotify_init) && defined(HAS_SYS_INOTIFY)
+#if defined(__NR_inotify_init) && defined(HAVE_SYS_INOTIFY)
 #include <sys/inotify.h>
 
 #ifndef IN_MOVE_SELF
@@ -373,7 +375,7 @@ main()
     tst_resm(TWARN, "Inotify syscall can be found at kernel 2.6.13 or 
higher.");
     return 0;
 #endif
-#ifndef HAS_SYS_INOTIFY
+#ifndef HAVE_SYS_INOTIFY
     tst_resm(TBROK, "can't find header sys/inotify.h");
     return 1;
 #endif

------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Reply via email to