svn commit: samba r10169 - in trunk/source: . lib

[metze at samba.org]

Author: metze
Date: 2005-09-12 11:48:18 +0000 (Mon, 12 Sep 2005)
New Revision: 10169

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10169

Log:
 r12168 at SERNOX (orig r10163):  metze | 2005-09-12 11:38:22 +0200
 try to fix the build on fedora 4, when --with-quota is not used
 (to actually fix the quotas, more work is needed)
 
 metze
 r12170 at SERNOX (orig r10165):  metze | 2005-09-12 12:23:14 +0200
 - 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

Modified:
   trunk/source/configure.in
   trunk/source/lib/sysquotas_4A.c
   trunk/source/lib/sysquotas_linux.c


Changeset:
Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in	2005-09-12 11:43:15 UTC (rev 10168)
+++ trunk/source/configure.in	2005-09-12 11:48:18 UTC (rev 10169)
@@ -3515,8 +3515,8 @@
 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_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 @@
 # 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>])

Modified: trunk/source/lib/sysquotas_4A.c
===================================================================
--- trunk/source/lib/sysquotas_4A.c	2005-09-12 11:43:15 UTC (rev 10168)
+++ trunk/source/lib/sysquotas_4A.c	2005-09-12 11:48:18 UTC (rev 10169)
@@ -24,7 +24,13 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_QUOTA
 
+#ifndef HAVE_SYS_QUOTAS
 #ifdef HAVE_QUOTACTL_4A
+#undef HAVE_QUOTACTL_4A
+#endif
+#endif
+
+#ifdef HAVE_QUOTACTL_4A
 /* long quotactl(int cmd, char *special, qid_t id, caddr_t addr) */
 /* this is used by: HPUX,IRIX */
 

Modified: trunk/source/lib/sysquotas_linux.c
===================================================================
--- trunk/source/lib/sysquotas_linux.c	2005-09-12 11:43:15 UTC (rev 10168)
+++ trunk/source/lib/sysquotas_linux.c	2005-09-12 11:48:18 UTC (rev 10169)
@@ -24,6 +24,12 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_QUOTA
 
+#ifndef HAVE_SYS_QUOTAS
+#ifdef HAVE_QUOTACTL_LINUX
+#undef HAVE_QUOTACTL_LINUX
+#endif
+#endif
+
 #ifdef HAVE_QUOTACTL_LINUX 
 
 #include "samba_linux_quota.h"