[PATCH] configure: Don't check for inotify on illumos

[Jeremy Allison]

On Mon, Apr 04, 2016 at 01:50:47PM +0200, Volker Lendecke wrote:
> Hi!
> 
> Review appreciated!
> 
> Thanks, Volker

LGTM. Pushed !

> phone: +49-551-370000-0, fax: +49-551-370000-9
> AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
> http://www.sernet.de, mailto:kontakt at sernet.de

> From 7180892262eb733bedf9282aecdcaeaad2e9ab75 Mon Sep 17 00:00:00 2001
> From: Jorge Schrauwen <sjorge at blackdot.be>
> Date: Sun, 3 Apr 2016 11:43:50 +0200
> Subject: [PATCH] configure: Don't check for inotify on illumos
> 
> Bug: https://bugzilla.samba.org/show_bug.cgi?id=11816
> Reviewed-by: Volker Lendecke <vl at samba.org>
> ---
>  source3/wscript                        | 11 +++++++----
>  source4/ntvfs/sysdep/wscript_configure | 13 +++++++++----
>  2 files changed, 16 insertions(+), 8 deletions(-)
> 
> diff --git a/source3/wscript b/source3/wscript
> index 9b73bfc..3118e28 100644
> --- a/source3/wscript
> +++ b/source3/wscript
> @@ -135,10 +135,13 @@ long ret = splice(0,0,1,0,400,SPLICE_F_MOVE);
>          headers='fcntl.h'):
>          conf.CHECK_DECLS('splice', reverse=True, headers='fcntl.h')
>  
> -    # Check for inotify support
> -    conf.CHECK_HEADERS('sys/inotify.h')
> -    if "HAVE_SYS_INOTIFY_H" in conf.env:
> -        conf.DEFINE('HAVE_INOTIFY', 1)
> +    # Check for inotify support (Skip if we are SunOS)
> +    #NOTE: illumos provides sys/inotify.h but is not an exact match for linux
> +    host_os = sys.platform
> +    if host_os.rfind('sunos') == -1:
> +        conf.CHECK_HEADERS('sys/inotify.h')
> +        if "HAVE_SYS_INOTIFY_H" in conf.env:
> +           conf.DEFINE('HAVE_INOTIFY', 1)
>  
>      # Check for kernel change notify support
>      conf.CHECK_CODE('''
> diff --git a/source4/ntvfs/sysdep/wscript_configure b/source4/ntvfs/sysdep/wscript_configure
> index aa63000..274fc08 100644
> --- a/source4/ntvfs/sysdep/wscript_configure
> +++ b/source4/ntvfs/sysdep/wscript_configure
> @@ -1,9 +1,14 @@
>  #!/usr/bin/env python
>  
> -conf.CHECK_HEADERS('sys/inotify.h', add_headers=False)
> +import sys
> +
> +# Check for inotify support (Skip if we are SunOS)
> +#NOTE: illumos provides sys/inotify.h but is not an exact match for linux
> +host_os = sys.platform
> +if host_os.rfind('sunos') == -1:
> +    conf.CHECK_HEADERS('sys/inotify.h', add_headers=False)
> +    if (conf.CONFIG_SET('HAVE_SYS_INOTIFY_H')):
> +        conf.DEFINE('HAVE_LINUX_INOTIFY', 1)
>  
>  conf.CHECK_DECLS('F_SETLEASE', headers='linux/fcntl.h', reverse=True)
>  conf.CHECK_DECLS('SA_SIGINFO', headers='signal.h', reverse=True)
> -
> -if (conf.CONFIG_SET('HAVE_SYS_INOTIFY_H')):
> -    conf.DEFINE('HAVE_LINUX_INOTIFY', 1)
> -- 
> 2.1.4
>