diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-09-29 14:28:57 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-09-29 14:50:00 +1000 |
| commit | 006bdc0be0bf2ef70b3eb24d679bd49f6d8079fd (patch) | |
| tree | d6f217749a26f93a805afefa1e2b9235a6437d01 | |
| parent | 931ed2509d93110b525f763ffb15ee3feff87fa0 (diff) | |
| download | samba-006bdc0be0bf2ef70b3eb24d679bd49f6d8079fd.tar.gz samba-006bdc0be0bf2ef70b3eb24d679bd49f6d8079fd.tar.bz2 samba-006bdc0be0bf2ef70b3eb24d679bd49f6d8079fd.zip | |
build: Fix quota tests, including move of sysquotas.c to the top level
This correctly detects quotas on FreeBSD
Andrew Bartlett
| -rw-r--r-- | source3/configure.in | 4 | ||||
| -rw-r--r-- | source3/wscript | 13 | ||||
| -rw-r--r-- | tests/sysquotas.c (renamed from source3/tests/sysquotas.c) | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/source3/configure.in b/source3/configure.in index 5045742cd4..d47f08a4a7 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4617,7 +4617,7 @@ AC_TRY_RUN_STRICT([ #define HAVE_QUOTACTL_4A 1 #define AUTOCONF_TEST 1 #include "confdefs.h" -#include "${srcdir-.}/../tests/sysquotas.c"],[$CFLAGS $Werror_FLAGS],[$CPPFLAGS],[$LDFLAGS], +#include "${srcdir-.}/../../tests/sysquotas.c"],[$CFLAGS $Werror_FLAGS],[$CPPFLAGS],[$LDFLAGS], samba_cv_HAVE_QUOTACTL_4A=yes,samba_cv_HAVE_QUOTACTL_4A=no,samba_cv_HAVE_QUOTACTL_4A=cross)]) if test x"$samba_cv_HAVE_QUOTACTL_4A" = x"yes"; then samba_cv_SYSQUOTA_FOUND=yes; @@ -4631,7 +4631,7 @@ AC_TRY_RUN_STRICT([ #define HAVE_QUOTACTL_4B 1 #define AUTOCONF_TEST 1 #include "confdefs.h" -#include "${srcdir-.}/../tests/sysquotas.c"],[$CFLAGS $Werror_FLAGS],[$CPPFLAGS],[$LDFLAGS], +#include "${srcdir-.}/../../tests/sysquotas.c"],[$CFLAGS $Werror_FLAGS],[$CPPFLAGS],[$LDFLAGS], samba_cv_HAVE_QUOTACTL_4B=yes,samba_cv_HAVE_QUOTACTL_4B=no,samba_cv_HAVE_QUOTACTL_4B=cross)]) if test x"$samba_cv_HAVE_QUOTACTL_4B" = x"yes"; then samba_cv_SYSQUOTA_FOUND=yes; diff --git a/source3/wscript b/source3/wscript index 3815c7ccdb..336b277a56 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1238,23 +1238,24 @@ main() { if not conf.CHECK_CODE(''' #define HAVE_QUOTACTL_4A 1 #define AUTOCONF_TEST 1 - #include "confdefs.h" - #include "${srcdir-.}/../tests/sysquotas.c" + #include "../tests/sysquotas.c" ''', + cflags=conf.env['WERROR_CFLAGS'], define='HAVE_QUOTACTL_4A', msg='for QUOTACTL_4A: long quotactl(int cmd, char *special, qid_t id, caddr_t addr)', execute=True, - local_include=False): + addmain=False): + conf.CHECK_CODE(''' #define HAVE_QUOTACTL_4B 1 #define AUTOCONF_TEST 1 - #include "confdefs.h" - #include "${srcdir-.}/../tests/sysquotas.c" + #include "../tests/sysquotas.c" ''', + cflags=conf.env['WERROR_CFLAGS'], define='HAVE_QUOTACTL_4B', msg='for QUOTACTL_4B: int quotactl(const char *path, int cmd, int id, char *addr)', execute=True, - local_include=False) + addmain=False) conf.CHECK_CODE(''' clnt_create("", RQUOTAPROG, RQUOTAVERS, "udp"); diff --git a/source3/tests/sysquotas.c b/tests/sysquotas.c index 1544dca7cf..afec3f1624 100644 --- a/source3/tests/sysquotas.c +++ b/tests/sysquotas.c @@ -42,7 +42,7 @@ extern int quotactl(int cmd, const char *special, uid_t uid, void *addr); struct SYS_DQBLK D; ret = quotactl(Q_GETQUOTA,"/dev/hda1",0,(void *)&D); - + return ret; } @@ -84,7 +84,7 @@ extern int quotactl(int cmd, const char *special, uid_t uid, void *addr); #endif int main(void) -{ +{ autoconf_quota(); return 0; } |