Browse code

bb11883 - Fix fanotify ./configure issue.

Steven Morgan authored on 2017/08/11 01:55:41
Showing 4 changed files
... ...
@@ -20286,6 +20286,7 @@ else
20286 20286
   want_fanotify="yes"
20287 20287
 fi
20288 20288
 
20289
+have_fanotify="no"
20289 20290
 
20290 20291
 if test "$cross_compiling" = no; then
20291 20292
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setpgrp takes no argument" >&5
... ...
@@ -20780,6 +20781,7 @@ linux*)
20780 20780
 
20781 20781
 $as_echo "#define C_LINUX 1" >>confdefs.h
20782 20782
 
20783
+    have_fanotify="no"
20783 20784
     if test "$have_pthreads" = "yes"; then
20784 20785
 	THREAD_LIBS="-lpthread"
20785 20786
 	TH_SAFE="-thread-safe"
... ...
@@ -20789,6 +20791,7 @@ if test "x$ac_cv_header_sys_fanotify_h" = xyes; then :
20789 20789
 
20790 20790
 $as_echo "#define FANOTIFY 1" >>confdefs.h
20791 20791
 
20792
+                have_fanotify="yes"
20792 20793
 fi
20793 20794
 
20794 20795
 
... ...
@@ -30247,14 +30250,14 @@ fi
30247 30247
 
30248 30248
 
30249 30249
    $as_echo_n "              fanotify    : "
30250
-   if test "x$want_fanotify" = "xno"; then :
30251
-  $as_echo "$want_fanotify (disabled)"
30252
-elif test "x$want_fanotify" = "xyes"; then :
30253
-  $as_echo "$want_fanotify"
30254
-elif test "x$want_fanotify" = "x"; then :
30255
-  $as_echo "$want_fanotify"
30256
-else
30257
-  $as_echo "$want_fanotify ($want_fanotify)"
30250
+   if test "x$have_fanotify" = "xno"; then :
30251
+  $as_echo "$have_fanotify (disabled)"
30252
+elif test "x$have_fanotify" = "xyes"; then :
30253
+  $as_echo "$have_fanotify"
30254
+elif test "x$have_fanotify" = "x"; then :
30255
+  $as_echo "$have_fanotify"
30256
+else
30257
+  $as_echo "$have_fanotify ($have_fanotify)"
30258 30258
 fi
30259 30259
 
30260 30260
 if test "x$ac_cv_have_control_in_msghdr" = "xyes"; then
... ...
@@ -222,7 +222,7 @@ else
222 222
     check_libs="$CHECK_LIBS"
223 223
 fi
224 224
 CL_MSG_STATUS([check       ],[$check_libs],[$enable_check_ut])
225
-CL_MSG_STATUS([fanotify    ],[$want_fanotify],[$want_fanotify])
225
+CL_MSG_STATUS([fanotify    ],[$have_fanotify],[$have_fanotify])
226 226
 if test "x$ac_cv_have_control_in_msghdr" = "xyes"; then
227 227
     CL_MSG_STATUS([fdpassing   ],[$have_fdpass],[$want_fdpassing])
228 228
 else
... ...
@@ -1,3 +1,4 @@
1 1
 AC_ARG_ENABLE([fanotify],
2 2
 [AS_HELP_STRING([--disable-fanotify], [do not add fanotify support (Linux only)])],
3 3
 want_fanotify=$enableval, want_fanotify="yes")
4
+have_fanotify="no"
... ...
@@ -1,11 +1,14 @@
1 1
 case "$target_os" in
2 2
 linux*)
3 3
     AC_DEFINE([C_LINUX],1,[target is linux])
4
+    have_fanotify="no"
4 5
     if test "$have_pthreads" = "yes"; then
5 6
 	THREAD_LIBS="-lpthread"
6 7
 	TH_SAFE="-thread-safe"
7 8
 	if test "$want_fanotify" = "yes"; then
8
-	    AC_CHECK_HEADER([sys/fanotify.h],AC_DEFINE([FANOTIFY],1,[use fanotify]),)
9
+	    AC_CHECK_HEADER([sys/fanotify.h],
10
+               [AC_DEFINE([FANOTIFY],1,[use fanotify])
11
+                have_fanotify="yes"],)
9 12
 	fi
10 13
     fi
11 14
     ;;