diff options
author | Alexander Bokovoy <ab@samba.org> | 2003-05-14 14:38:11 +0000 |
---|---|---|
committer | Alexander Bokovoy <ab@samba.org> | 2003-05-14 14:38:11 +0000 |
commit | 2c01eef4d7ea9ed57ea5f68a0e75559e101fd26f (patch) | |
tree | 98c576bbbae29c213d7da4597b69cfa2a0591d14 /source3/configure.in | |
parent | bc2a3748e9caa8f60f7c2387e7eecd7fb3fae899 (diff) | |
download | samba-2c01eef4d7ea9ed57ea5f68a0e75559e101fd26f.tar.gz samba-2c01eef4d7ea9ed57ea5f68a0e75559e101fd26f.tar.bz2 samba-2c01eef4d7ea9ed57ea5f68a0e75559e101fd26f.zip |
Evolve quotas configure check more. Patch from Stefan (metze) Metzemacher. Now we are defaulting to --with-quotas=no but anyway trying to test them in configure. This is done to get information about as much quota API variations as possible -- when --with-quotas=no this does not affect build but provides us with more detailed information on build farm.
(This used to be commit 3786695c72e6ff6a52a527382ac77142e236971b)
Diffstat (limited to 'source3/configure.in')
-rw-r--r-- | source3/configure.in | 79 |
1 files changed, 66 insertions, 13 deletions
diff --git a/source3/configure.in b/source3/configure.in index 28b3a3a26b..8b9a6b8252 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -2579,41 +2579,71 @@ AC_ARG_WITH(profiling-data, ################################################# # check for experimental disk-quotas support +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 + AC_MSG_CHECKING(whether to try disk-quotas support) AC_ARG_WITH(quotas, [ --with-quotas Include disk-quota support (default=no)], [ case "$withval" in yes) AC_MSG_RESULT(yes) + samba_cv_WITH_QUOTAS=yes samba_cv_TRY_QUOTAS=yes + samba_cv_RUN_QUOTA_TESTS=yes + #set sys quotas to auto in this case + samba_cv_TRY_SYS_QUOTAS=auto ;; - *) + auto) + AC_MSG_RESULT(auto) + samba_cv_WITH_QUOTAS=auto + samba_cv_TRY_QUOTAS=auto + samba_cv_RUN_QUOTA_TESTS=auto + #set sys quotas to auto in this case + samba_cv_TRY_SYS_QUOTAS=auto + ;; + no) AC_MSG_RESULT(no) + samba_cv_WITH_QUOTAS=no + samba_cv_TRY_QUOTAS=no + samba_cv_RUN_QUOTA_TESTS=no + ;; + *) + AC_MSG_RESULT(${samba_cv_TRY_QUOTAS}) ;; esac ], - AC_MSG_RESULT(no) + AC_MSG_RESULT(${samba_cv_TRY_QUOTAS}) ) -samba_cv_TRY_SYS_QUOTAS=auto AC_MSG_CHECKING(whether to try the new lib/sysquotas.c interface) AC_ARG_WITH(sys-quotas, [ --with-sys-quotas Include lib/sysquotas.c support (default=auto)], [ case "$withval" in yes) AC_MSG_RESULT(yes) - samba_cv_TRY_QUOTAS=yes + samba_cv_WITH_SYS_QUOTAS=yes samba_cv_TRY_SYS_QUOTAS=yes + samba_cv_RUN_QUOTA_TESTS=yes + ;; + auto) + AC_MSG_RESULT(auto) + samba_cv_WITH_SYS_QUOTAS=auto + samba_cv_TRY_SYS_QUOTAS=auto + samba_cv_RUN_QUOTA_TESTS=auto ;; no) AC_MSG_RESULT(no) + samba_cv_WITH_SYS_QUOTAS=no samba_cv_TRY_SYS_QUOTAS=no ;; *) - AC_MSG_RESULT(auto) + AC_MSG_RESULT(${samba_cv_TRY_SYS_QUOTAS}) ;; esac ], - AC_MSG_RESULT(auto) + AC_MSG_RESULT(${samba_cv_TRY_SYS_QUOTAS}) ) if test x"$samba_cv_TRY_SYS_QUOTAS" = x"auto"; then @@ -2621,18 +2651,19 @@ 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_TRY_SYS_QUOTAS=yes + samba_cv_RUN_QUOTA_TESTS=yes ;; *) AC_MSG_RESULT(no) - samba_cv_TRY_SYS_QUOTAS=no + samba_cv_TRY_SYS_QUOTAS=no ;; esac fi ############################################# # only check for quota stuff if --with-quotas -if test x"$samba_cv_TRY_QUOTAS" = x"yes"; then +if test x"$samba_cv_RUN_QUOTA_TESTS" != x"no"; then # For quotas on Veritas VxFS filesystems AC_CHECK_HEADERS(sys/fs/vx_quota.h) @@ -2755,8 +2786,22 @@ AC_CHECK_HEADERS(devnm.h) # check for devnm AC_CHECK_FUNCS(devnm) +if test x"$samba_cv_WITH_SYS_QUOTAS" = x"yes"; then + if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then + # if --with-sys-quotas=yes then build it + # you have can use the get/set quota command smb.conf + # options then + samba_cv_SYSQUOTA_FOUND=auto + fi + if test x"$samba_cv_TRY_SYS_QUOTAS" != x"yes"; then + # if --with-sys-quotas=yes then build it + # you have can use the get/set quota command smb.conf + # options then + samba_cv_TRY_SYS_QUOTAS=auto + fi +fi -if test x"$samba_cv_SYSQUOTA_FOUND" = x"yes"; then +if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then AC_CACHE_CHECK([whether the sys_quota interface works],samba_cv_SYSQUOTA_WORKS,[ SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/smbwrapper -I${srcdir-.}/nsswitch" @@ -2771,7 +2816,7 @@ CPPFLAGS="$SAVE_CPPFLAGS" ]) if test x"$samba_cv_SYSQUOTA_WORKS" = x"yes"; then AC_MSG_CHECKING(whether to use the new lib/sysquotas.c interface) - if test x"$samba_cv_TRY_SYS_QUOTAS" = x"yes"; then + if test x"$samba_cv_TRY_SYS_QUOTAS" != x"no"; then AC_DEFINE(WITH_QUOTAS,1,[Whether to use disk quota support]) AC_DEFINE(HAVE_SYS_QUOTAS,1,[Whether the new lib/sysquotas.c interface can be used]) samba_cv_WE_USE_SYS_QUOTAS=yes @@ -2794,13 +2839,21 @@ AC_TRY_COMPILE([ CPPFLAGS="$SAVE_CPPFLAGS" ]) if test x"$samba_cv_QUOTA_WORKS" = x"yes"; then +AC_MSG_CHECKING(whether to use the old quota support) if test x"$samba_cv_WE_USE_SYS_QUOTAS" != x"yes"; then - AC_DEFINE(WITH_QUOTAS,1,[Whether to use disk quota support]) + if test x"$samba_cv_TRY_QUOTAS" != x"no"; then + AC_DEFINE(WITH_QUOTAS,1,[Whether to use disk quota support]) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + else + AC_MSG_RESULT(no) fi fi #################### -# End of quota check +# End of quota check samba_cv_RUN_QUOTA_TESTS fi ################################################# |