korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-27 03:54:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure: don't fail if /usr/include/sys/mount.h does not exist

Browse Source 
The AX_CHECK_MOUNT_OPT macro fails if /usr/include/sys/mount.h.
Unfortunately, the GNU HURD doesn't have this header file.  Drop the
requirement, since if it doesn't exist, the macro will assume that
given mount options don't exist, which for e2fsprogs is used to test
to for the existence of the mount options nosuid and nodev.  This is
only used for fuse2fs, and HURD doesn't support fuse2fs anyway.

Addresses-Debian-Bug: #944649
Reported-by: Svante Signell <svante.signell@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2019-11-13 13:55:29 -05:00
parent ea4d53b7b9
commit b9bb6a512e
2 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acinclude.m4
View File

@ -158,10 +158,6 @@ dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' ot
AC_DEFUN([AX_CHECK_MOUNT_OPT], [__AX_CHECK_MOUNT_OPT(m4_tolower([$1]),m4_toupper([$1]))]) AC_DEFUN([AX_CHECK_MOUNT_OPT], [__AX_CHECK_MOUNT_OPT(m4_tolower([$1]),m4_toupper([$1]))])
AC_DEFUN([__AX_CHECK_MOUNT_OPT], AC_DEFUN([__AX_CHECK_MOUNT_OPT],
[ [
AS_IF([test "x$ac_cv_header_sys_mount_h" = x],
[AC_CHECK_HEADERS([sys/mount.h])])
AS_IF([test "x$ac_cv_header_sys_mount_h" = xno],
[AC_MSG_FAILURE([error: sys/mount.h not present on your system!])])
AS_ECHO_N("checking for mount '$1' option... ") AS_ECHO_N("checking for mount '$1' option... ")
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#include <sys/mount.h>], [#include <sys/mount.h>],

40
configure vendored
View File

@ -13803,26 +13803,6 @@ $as_echo "#define HAVE_EXT2_IOCTLS 1" >>confdefs.h
;; ;;
esac esac
if test "x$ac_cv_header_sys_mount_h" = x; then :
for ac_header in sys/mount.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default"
if test "x$ac_cv_header_sys_mount_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_MOUNT_H 1
_ACEOF
fi
done
fi
if test "x$ac_cv_header_sys_mount_h" = xno; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "error: sys/mount.h not present on your system!
See \`config.log' for more details" "$LINENO" 5; }
fi
$as_echo_n "checking for mount 'nosuid' option... " $as_echo_n "checking for mount 'nosuid' option... "
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@ -13870,26 +13850,6 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "x$ac_cv_header_sys_mount_h" = x; then :
for ac_header in sys/mount.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default"
if test "x$ac_cv_header_sys_mount_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_MOUNT_H 1
_ACEOF
fi
done
fi
if test "x$ac_cv_header_sys_mount_h" = xno; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "error: sys/mount.h not present on your system!
See \`config.log' for more details" "$LINENO" 5; }
fi
$as_echo_n "checking for mount 'nodev' option... " $as_echo_n "checking for mount 'nodev' option... "
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */