autofs-5.0.7 - add enable sloppy mount option to configure

From: Ian Kent <ikent@redhat.com>

Add an option --enable-sloppy-mount or --disable-sloppy-mount to force

or prevent the use of the -s option to mount, thus avoiding the

autodetection. This can be useful in setups where executing mount

might be undesirable, particularly in packaging environments.

2013-04-04 Martin von Gagern

References:

 * https://bugs.gentoo.org/453778

---

 CHANGELOG    |    1 

 aclocal.m4   |    2 

 configure    |  252 +++++++++++++++++++++++++++++++---------------------------

 configure.in |   10 ++

 4 files changed, 146 insertions(+), 119 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG

index 61edddf..66c11de 100644

--- a/CHANGELOG

+++ b/CHANGELOG

@@ -42,6 +42,7 @@

 - fix submount tree not all expiring.

 - make dump maps check for duplicate indirect mounts.

 - document allowed map sources in auto.master.

+- add enable sloppy mount option to configure.

 25/07/2012 autofs-5.0.7

 =======================

diff --git a/aclocal.m4 b/aclocal.m4

index 47bca0c..c5de159 100644

--- a/aclocal.m4

+++ b/aclocal.m4

@@ -66,7 +66,7 @@ AC_DEFUN(AF_SLOPPY_MOUNT,

 [if test -n "$MOUNT" ; then

   AC_MSG_CHECKING([if mount accepts the -s option])

   if "$MOUNT" -s > /dev/null 2>&1 ; then

-    AC_DEFINE(HAVE_SLOPPY_MOUNT, 1, [define if the mount command supports the -s option])

+    enable_sloppy_mount=yes

     AC_MSG_RESULT(yes)

   else

     AC_MSG_RESULT(no)

diff --git a/configure b/configure

index c1423d8..08b7ccc 100755

--- a/configure

+++ b/configure

@@ -1,11 +1,9 @@

 #! /bin/sh

 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.68.

+# Generated by GNU Autoconf 2.69.

 #

 #

-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software

-# Foundation, Inc.

+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.

 #

 #

 # This configure script is free software; the Free Software Foundation

@@ -134,6 +132,31 @@ export LANGUAGE

 # CDPATH.

 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH

+# Use a proper internal environment variable to ensure we don't fall

+  # into an infinite loop, continuously re-executing ourselves.

+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then

+    _as_can_reexec=no; export _as_can_reexec;

+    # We cannot yet assume a decent shell, so we have to provide a

+# neutralization value for shells without unset; and this also

+# works around shells that cannot unset nonexistent variables.

+# Preserve -v and -x to the replacement shell.

+BASH_ENV=/dev/null

+ENV=/dev/null

+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV

+case $- in # ((((

+  *v*x* | *x*v* ) as_opts=-vx ;;

+  *v* ) as_opts=-v ;;

+  *x* ) as_opts=-x ;;

+  * ) as_opts= ;;

+esac

+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}

+# Admittedly, this is quite paranoid, since all the known shells bail

+# out after a failed `exec'.

+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2

+as_fn_exit 255

+  fi

+  # We don't want this to propagate to other subprocesses.

+          { _as_can_reexec=; unset _as_can_reexec;}

 if test "x$CONFIG_SHELL" = x; then

   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :

   emulate sh

@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :

 else

   exitcode=1; echo positional parameters were not saved.

 fi

-test x\$exitcode = x0 || exit 1"

+test x\$exitcode = x0 || exit 1

+test -x / || exit 1"

   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO

   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO

   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&

@@ -212,21 +236,25 @@ IFS=$as_save_IFS

       if test "x$CONFIG_SHELL" != x; then :

-  # We cannot yet assume a decent shell, so we have to provide a

-	# neutralization value for shells without unset; and this also

-	# works around shells that cannot unset nonexistent variables.

-	# Preserve -v and -x to the replacement shell.

-	BASH_ENV=/dev/null

-	ENV=/dev/null

-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV

-	export CONFIG_SHELL

-	case $- in # ((((

-	  *v*x* | *x*v* ) as_opts=-vx ;;

-	  *v* ) as_opts=-v ;;

-	  *x* ) as_opts=-x ;;

-	  * ) as_opts= ;;

-	esac

-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}

+  export CONFIG_SHELL

+             # We cannot yet assume a decent shell, so we have to provide a

+# neutralization value for shells without unset; and this also

+# works around shells that cannot unset nonexistent variables.

+# Preserve -v and -x to the replacement shell.

+BASH_ENV=/dev/null

+ENV=/dev/null

+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV

+case $- in # ((((

+  *v*x* | *x*v* ) as_opts=-vx ;;

+  *v* ) as_opts=-v ;;

+  *x* ) as_opts=-x ;;

+  * ) as_opts= ;;

+esac

+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}

+# Admittedly, this is quite paranoid, since all the known shells bail

+# out after a failed `exec'.

+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2

+exit 255

 fi

     if test x$as_have_required = xno; then :

@@ -328,6 +356,14 @@ $as_echo X"$as_dir" |

 } # as_fn_mkdir_p

+

+# as_fn_executable_p FILE

+# -----------------------

+# Test if FILE is an executable regular file.

+as_fn_executable_p ()

+{

+  test -f "$1" && test -x "$1"

+} # as_fn_executable_p

 # as_fn_append VAR VALUE

 # ----------------------

 # Append the text in VALUE to the end of the definition contained in VAR. Take

@@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits

   chmod +x "$as_me.lineno" ||

     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }

+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have

+  # already done that, so ensure we don't try to do so again and fall

+  # in an infinite loop.  This has already happened in practice.

+  _as_can_reexec=no; export _as_can_reexec

   # Don't try to exec as it changes $[0], causing all sort of problems

   # (the dirname of $[0] is not the place where we might find the

   # original and so on.  Autoconf is especially sensitive to this).

@@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then

     # ... but there are two gotchas:

     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

-    # In both cases, we have to default to `cp -p'.

+    # In both cases, we have to default to `cp -pR'.

     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

-      as_ln_s='cp -p'

+      as_ln_s='cp -pR'

   elif ln conf$$.file conf$$ 2>/dev/null; then

     as_ln_s=ln

   else

-    as_ln_s='cp -p'

+    as_ln_s='cp -pR'

   fi

 else

-  as_ln_s='cp -p'

+  as_ln_s='cp -pR'

 fi

 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

 rmdir conf$$.dir 2>/dev/null

@@ -504,28 +544,8 @@ else

   as_mkdir_p=false

 fi

-if test -x / >/dev/null 2>&1; then

-  as_test_x='test -x'

-else

-  if ls -dL / >/dev/null 2>&1; then

-    as_ls_L_option=L

-  else

-    as_ls_L_option=

-  fi

-  as_test_x='

-    eval sh -c '\''

-      if test -d "$1"; then

-	test -d "$1/.";

-      else

-	case $1 in #(

-	-*)set "./$1";;

-	esac;

-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((

-	???[sx]*):;;*)false;;esac;fi

-    '\'' sh

-  '

-fi

-as_executable_p=$as_test_x

+as_test_x='test -x'

+as_executable_p=as_fn_executable_p

 # Sed expression to map a string onto a valid CPP name.

 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

@@ -715,6 +735,7 @@ with_fifodir

 with_flagdir

 with_libtirpc

 with_dmalloc

+enable_sloppy_mount

 with_hesiod

 with_openldap

 with_sasl

@@ -1187,8 +1208,6 @@ target=$target_alias

 if test "x$host_alias" != x; then

   if test "x$build_alias" = x; then

     cross_compiling=maybe

-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.

-    If a cross compiler is detected then cross compile mode will be used" >&2

   elif test "x$build_alias" != "x$host_alias"; then

     cross_compiling=yes

   fi

@@ -1341,6 +1360,7 @@ Optional Features:

   --disable-option-checking  ignore unrecognized --enable/--with options

   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)

   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]

+  --enable-sloppy-mount   enable the use of the -s option to mount

   --disable-ext-env	  disable search in environment for substitution variable

   --disable-mount-locking disable use of locking when spawning mount command

   --enable-force-shutdown enable USR1 signal to force unlink umount of any

@@ -1442,9 +1462,9 @@ test -n "$ac_init_help" && exit $ac_status

 if $ac_init_version; then

   cat <<\_ACEOF

 configure

-generated by GNU Autoconf 2.68

+generated by GNU Autoconf 2.69

-Copyright (C) 2010 Free Software Foundation, Inc.

+Copyright (C) 2012 Free Software Foundation, Inc.

 This configure script is free software; the Free Software Foundation

 gives unlimited permission to copy, distribute and modify it.

 _ACEOF

@@ -1520,7 +1540,7 @@ $as_echo "$ac_try_echo"; } >&5

 	 test ! -s conftest.err

        } && test -s conftest$ac_exeext && {

 	 test "$cross_compiling" = yes ||

-	 $as_test_x conftest$ac_exeext

+	 test -x conftest$ac_exeext

        }; then :

   ac_retval=0

 else

@@ -1740,7 +1760,7 @@ This file contains any messages produced by compilers while

 running configure, to aid debugging if configure makes a mistake.

 It was created by $as_me, which was

-generated by GNU Autoconf 2.68.  Invocation command line was

+generated by GNU Autoconf 2.69.  Invocation command line was

   $ $0 $@

@@ -2324,7 +2344,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_CC="${ac_tool_prefix}gcc"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -2364,7 +2384,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_CC="gcc"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -2417,7 +2437,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_CC="${ac_tool_prefix}cc"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -2458,7 +2478,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

        ac_prog_rejected=yes

        continue

@@ -2516,7 +2536,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -2560,7 +2580,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_CC="$ac_prog"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3006,8 +3026,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

 /* end confdefs.h.  */

 #include <stdarg.h>

 #include <stdio.h>

-#include <sys/types.h>

-#include <sys/stat.h>

+struct stat;

 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */

 struct buf { int x; };

 FILE * (*rcsopen) (struct buf *, struct stat *, int);

@@ -3209,7 +3228,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_MOUNT="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3269,7 +3288,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_MOUNT_NFS="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3329,7 +3348,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_UMOUNT="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3389,7 +3408,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_E2FSCK="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3448,7 +3467,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_E3FSCK="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3507,7 +3526,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_E4FSCK="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3566,7 +3585,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_MODPROBE="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3626,7 +3645,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_LEX="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3682,7 +3701,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_YACC="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3738,7 +3757,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3794,7 +3813,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_RPCGEN="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3858,13 +3877,19 @@ fi

 # Newer mounts have the -s (sloppy) option to ignore unknown options,

 # good for portability

 #

-if test -n "$MOUNT" ; then

+# Check whether --enable-sloppy-mount was given.

+if test "${enable_sloppy_mount+set}" = set; then :

+  enableval=$enable_sloppy_mount;

+else

+  enable_sloppy_mount=auto

+fi

+

+if test x$enable_sloppy_mount = xauto; then

+	if test -n "$MOUNT" ; then

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if mount accepts the -s option" >&5

 $as_echo_n "checking if mount accepts the -s option... " >&6; }

   if "$MOUNT" -s > /dev/null 2>&1 ; then

-

-$as_echo "#define HAVE_SLOPPY_MOUNT 1" >>confdefs.h

-

+    enable_sloppy_mount=yes

     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

 $as_echo "yes" >&6; }

   else

@@ -3872,6 +3897,12 @@ $as_echo "yes" >&6; }

 $as_echo "no" >&6; }

   fi

 fi

+fi

+if test x$enable_sloppy_mount = xyes; then

+

+$as_echo "#define HAVE_SLOPPY_MOUNT 1" >>confdefs.h

+

+fi

 # LDAP SASL auth needs libxml and Kerberos

 for ac_prog in xml2-config

@@ -3894,7 +3925,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_XML_CONFIG="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3969,7 +4000,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -4387,7 +4418,7 @@ do

     for ac_prog in grep ggrep; do

     for ac_exec_ext in '' $ac_executable_extensions; do

       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

+      as_fn_executable_p "$ac_path_GREP" || continue

 # Check for GNU ac_path_GREP and select it if it is found.

   # Check for GNU $ac_path_GREP

 case `"$ac_path_GREP" --version 2>&1` in

@@ -4453,7 +4484,7 @@ do

     for ac_prog in egrep; do

     for ac_exec_ext in '' $ac_executable_extensions; do

       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

+      as_fn_executable_p "$ac_path_EGREP" || continue

 # Check for GNU ac_path_EGREP and select it if it is found.

   # Check for GNU $ac_path_EGREP

 case `"$ac_path_EGREP" --version 2>&1` in

@@ -4928,7 +4959,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_CC="${ac_tool_prefix}gcc"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -4968,7 +4999,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_CC="gcc"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -5021,7 +5052,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_CC="${ac_tool_prefix}cc"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -5062,7 +5093,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

        ac_prog_rejected=yes

        continue

@@ -5120,7 +5151,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -5164,7 +5195,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_CC="$ac_prog"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -5360,8 +5391,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

 /* end confdefs.h.  */

 #include <stdarg.h>

 #include <stdio.h>

-#include <sys/types.h>

-#include <sys/stat.h>

+struct stat;

 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */

 struct buf { int x; };

 FILE * (*rcsopen) (struct buf *, struct stat *, int);

@@ -5882,16 +5912,16 @@ if (echo >conf$$.file) 2>/dev/null; then

     # ... but there are two gotchas:

     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

-    # In both cases, we have to default to `cp -p'.

+    # In both cases, we have to default to `cp -pR'.

     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

-      as_ln_s='cp -p'

+      as_ln_s='cp -pR'

   elif ln conf$$.file conf$$ 2>/dev/null; then

     as_ln_s=ln

   else

-    as_ln_s='cp -p'

+    as_ln_s='cp -pR'

   fi

 else

-  as_ln_s='cp -p'

+  as_ln_s='cp -pR'

 fi

 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

 rmdir conf$$.dir 2>/dev/null

@@ -5951,28 +5981,16 @@ else

   as_mkdir_p=false

 fi

-if test -x / >/dev/null 2>&1; then

-  as_test_x='test -x'

-else

-  if ls -dL / >/dev/null 2>&1; then

-    as_ls_L_option=L

-  else

-    as_ls_L_option=

-  fi

-  as_test_x='

-    eval sh -c '\''

-      if test -d "$1"; then

-	test -d "$1/.";

-      else

-	case $1 in #(

-	-*)set "./$1";;

-	esac;

-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((

-	???[sx]*):;;*)false;;esac;fi

-    '\'' sh

-  '

-fi

-as_executable_p=$as_test_x

+

+# as_fn_executable_p FILE

+# -----------------------

+# Test if FILE is an executable regular file.

+as_fn_executable_p ()

+{

+  test -f "$1" && test -x "$1"

+} # as_fn_executable_p

+as_test_x='test -x'

+as_executable_p=as_fn_executable_p

 # Sed expression to map a string onto a valid CPP name.

 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

@@ -5994,7 +6012,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

 # values after options handling.

 ac_log="

 This file was extended by $as_me, which was

-generated by GNU Autoconf 2.68.  Invocation command line was

+generated by GNU Autoconf 2.69.  Invocation command line was

   CONFIG_FILES    = $CONFIG_FILES

   CONFIG_HEADERS  = $CONFIG_HEADERS

@@ -6056,10 +6074,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"

 ac_cs_version="\\

 config.status

-configured by $0, generated by GNU Autoconf 2.68,

+configured by $0, generated by GNU Autoconf 2.69,

   with options \\"\$ac_cs_config\\"

-Copyright (C) 2010 Free Software Foundation, Inc.

+Copyright (C) 2012 Free Software Foundation, Inc.

 This config.status script is free software; the Free Software Foundation

 gives unlimited permission to copy, distribute and modify it."

@@ -6147,7 +6165,7 @@ fi

 _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

 if \$ac_cs_recheck; then

-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

   shift

   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6

   CONFIG_SHELL='$SHELL'

diff --git a/configure.in b/configure.in

index 4029375..559045a 100644

--- a/configure.in

+++ b/configure.in

@@ -157,7 +157,15 @@ AC_SUBST(sssldir)

 # Newer mounts have the -s (sloppy) option to ignore unknown options,

 # good for portability

 #

-AF_SLOPPY_MOUNT()

+AC_ARG_ENABLE(sloppy-mount,

+[  --enable-sloppy-mount   enable the use of the -s option to mount],,

+	enable_sloppy_mount=auto)

+if test x$enable_sloppy_mount = xauto; then

+	AF_SLOPPY_MOUNT()

+fi

+if test x$enable_sloppy_mount = xyes; then

+	AC_DEFINE(HAVE_SLOPPY_MOUNT, 1, [define if the mount command supports the -s option])

+fi

 # LDAP SASL auth needs libxml and Kerberos

 AF_CHECK_LIBXML()