diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-09-12 10:23:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:03:35 -0500 |
| commit | 8779f74eef46d795c5e086eec5bedda57f3520e6 (patch) | |
| tree | 8313353b55d50a76da6abda7c9ea30ff33f39949 | |
| parent | e80d6cba6180e3bfa5f61b7f142b865dd445eb39 (diff) | |
| download | samba-8779f74eef46d795c5e086eec5bedda57f3520e6.tar.gz samba-8779f74eef46d795c5e086eec5bedda57f3520e6.tar.bz2 samba-8779f74eef46d795c5e086eec5bedda57f3520e6.zip | |
r10165: - use the sysquota interface on linux by default (as the configure --help, shows since a few years ago)
- fix the logic for using the builtin linux quota support
(hopeful fix the quota build on the fedora 4 builtfarm boxes)
metze
(This used to be commit 6768c07bd1fc726f4cead361b00a5283af48eb77)
| -rw-r--r-- | source3/configure.in | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/source3/configure.in b/source3/configure.in index fd439e423f..c0afe0de1d 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3515,8 +3515,8 @@ samba_cv_WITH_QUOTAS=auto samba_cv_TRY_QUOTAS=no samba_cv_RUN_QUOTA_TESTS=auto samba_cv_WITH_SYS_QUOTAS=auto -samba_cv_TRY_SYS_QUOTAS=no -samba_cv_SYSQUOTA_FOUND=no; +samba_cv_TRY_SYS_QUOTAS=auto +samba_cv_SYSQUOTA_FOUND=no AC_MSG_CHECKING(whether to try disk-quotas support) AC_ARG_WITH(quotas, @@ -3579,18 +3579,13 @@ AC_ARG_WITH(sys-quotas, AC_MSG_RESULT(${samba_cv_TRY_SYS_QUOTAS}) ) -if test x"$samba_cv_TRY_SYS_QUOTAS" != x"no"; then +if test x"$samba_cv_TRY_SYS_QUOTAS" = x"auto"; then AC_MSG_CHECKING(whether to try the lib/sysquotas.c interface on ${host_os}) case "$host_os" in *linux*) AC_MSG_RESULT(yes) samba_cv_TRY_SYS_QUOTAS=yes samba_cv_RUN_QUOTA_TESTS=yes - samba_cv_SYSQUOTA_FOUND=yes - AC_DEFINE(HAVE_QUOTACTL_LINUX,1,[Whether Linux quota support is available]) - samba_cv_sysquotas_file="lib/sysquotas_linux.c" - AC_DEFINE(HAVE_LINUX_XFS_QUOTAS,1,[Whether Linux xfs quota support is available]) - samba_cv_found_xfs_header=yes ;; *) AC_MSG_RESULT(no) @@ -3603,6 +3598,24 @@ fi # only check for quota stuff if --with-quotas if test x"$samba_cv_RUN_QUOTA_TESTS" != x"no"; then +case "$host_os" in + # on linux we didn't need to test we have builtin support + *linux*) + samba_cv_SYSQUOTA_FOUND=yes + AC_DEFINE(HAVE_QUOTACTL_LINUX,1,[Whether Linux quota support is available]) + samba_cv_sysquotas_file="lib/sysquotas_linux.c" + AC_MSG_CHECKING(whether to use the lib/sysquotas_linux.c builtin support) + AC_MSG_RESULT(yes) + + AC_DEFINE(HAVE_LINUX_XFS_QUOTAS,1,[Whether Linux xfs quota support is available]) + samba_cv_found_xfs_header=yes + AC_MSG_CHECKING(whether to use the lib/sysquotas_xfs.c builtin support) + AC_MSG_RESULT(yes) + ;; + *) + ;; +esac + # some broken header files need this AC_CHECK_HEADER(asm/types.h,[ AC_DEFINE(HAVE_ASM_TYPES_H,1,[check for <asm/types.h>]) |