diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-14 22:37:33 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-03-15 01:12:15 +0100 |
| commit | 180b3a3bbe922f9d84df4d557be7422d94668b53 (patch) | |
| tree | 094f6dd6062c3aeb696243dbe075b9dda903bce4 | |
| parent | 04593da3016482afa21f3a8873a47e9adbf183bb (diff) | |
| download | samba-180b3a3bbe922f9d84df4d557be7422d94668b53.tar.gz samba-180b3a3bbe922f9d84df4d557be7422d94668b53.tar.bz2 samba-180b3a3bbe922f9d84df4d557be7422d94668b53.zip | |
build: Do not build with utmp when we do not have utmp.h
This matches the autoconf build, and should partially address bug #8709.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Thu Mar 15 01:12:15 CET 2012 on sn-devel-104
| -rw-r--r-- | source3/wscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/wscript b/source3/wscript index 829a7e3b7d..4da8a44709 100644 --- a/source3/wscript +++ b/source3/wscript @@ -825,6 +825,8 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); conf.undefine('HAVE_GSSAPI_GSSAPI_H') if Options.options.with_utmp: + conf.env.with_utmp = True + if not conf.CHECK_HEADERS('utmp.h'): conf.env.with_utmp = False conf.CHECK_FUNCS('pututline pututxline updwtmp updwtmpx getutmpx getutxent') conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_name', headers='utmp.h', define='HAVE_UT_UT_NAME') @@ -853,7 +855,8 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); conf.CHECK_CODE('struct utmp utarg; struct utmp *utreturn; utreturn = pututline(&utarg);', 'PUTUTLINE_RETURNS_UTMP', headers='utmp.h', msg="Checking whether pututline returns pointer") - conf.DEFINE('WITH_UTMP', 1) + if conf.env.with_utmp: + conf.DEFINE('WITH_UTMP', 1) if Options.options.with_avahi: conf.env.with_avahi = True |