summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-09-08 08:46:42 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-10-07 17:45:20 +1100
commit4980cd772a6c81b528d5a40646f4f1d0dde17b16 (patch)
tree413c3074dc3dd2c50515a50c44a27f80ea9b0043
parent1da89da251f225fc2246ac49c9656df1df7336bd (diff)
downloadsamba-4980cd772a6c81b528d5a40646f4f1d0dde17b16.tar.gz
samba-4980cd772a6c81b528d5a40646f4f1d0dde17b16.tar.bz2
samba-4980cd772a6c81b528d5a40646f4f1d0dde17b16.zip
build: Remove _SAMBA_WAF_BUILD_
The _SAMBA_BUILD_ macro can pick the difference between autoconf and waf builds now Andrew Bartlett
-rw-r--r--source3/passdb/machine_account_secrets.c8
-rwxr-xr-xwscript1
2 files changed, 4 insertions, 5 deletions
diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index e1b7855b01..16b563c2bb 100644
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -57,7 +57,7 @@ bool secrets_store_domain_sid(const char *domain, const struct dom_sid *sid)
{
bool ret;
-#ifdef _SAMBA_WAF_BUILD_
+#if _SAMBA_BUILD_ == 4
if (strequal(domain, get_global_sam_name()) &&
(pdb_capabilities() & PDB_CAP_ADS)) {
/* If we have a ADS-capable passdb backend, we
@@ -81,7 +81,7 @@ bool secrets_fetch_domain_sid(const char *domain, struct dom_sid *sid)
struct dom_sid *dyn_sid;
size_t size = 0;
-#ifdef _SAMBA_WAF_BUILD_
+#if _SAMBA_BUILD_ == 4
if (strequal(domain, get_global_sam_name()) &&
(pdb_capabilities() & PDB_CAP_ADS)) {
struct pdb_domain_info *domain_info;
@@ -118,7 +118,7 @@ bool secrets_store_domain_guid(const char *domain, struct GUID *guid)
{
fstring key;
-#ifdef _SAMBA_WAF_BUILD_
+#if _SAMBA_BUILD_ == 4
if (strequal(domain, get_global_sam_name()) &&
(pdb_capabilities() & PDB_CAP_ADS)) {
/* If we have a ADS-capable passdb backend, we
@@ -141,7 +141,7 @@ bool secrets_fetch_domain_guid(const char *domain, struct GUID *guid)
size_t size = 0;
struct GUID new_guid;
-#ifdef _SAMBA_WAF_BUILD_
+#if _SAMBA_BUILD_ == 4
if (strequal(domain, get_global_sam_name()) &&
(pdb_capabilities() & PDB_CAP_ADS)) {
struct pdb_domain_info *domain_info;
diff --git a/wscript b/wscript
index 214c398e70..fb9cc4096d 100755
--- a/wscript
+++ b/wscript
@@ -43,7 +43,6 @@ def configure(conf):
version = samba_version.load_version(env=conf.env)
conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
- conf.DEFINE('_SAMBA_WAF_BUILD_', version.MAJOR)
conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True)
conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)