summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2010-05-25 23:53:04 +0200
committerKai Blin <kai@samba.org>2010-05-26 00:28:34 +0200
commitb2546ee5571e644d3cb784f33517bf9f28c134d7 (patch)
tree261f0f16f72992be52c2e08a204332a6bc9b521e /source3
parent475531c9bb6c2d4b522a77d0ced09a9775704085 (diff)
downloadsamba-b2546ee5571e644d3cb784f33517bf9f28c134d7.tar.gz
samba-b2546ee5571e644d3cb784f33517bf9f28c134d7.tar.bz2
samba-b2546ee5571e644d3cb784f33517bf9f28c134d7.zip
s3-waf: Don't hardcode the name of the awk executable in wscript_build
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript2
-rw-r--r--source3/wscript_build2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/wscript b/source3/wscript
index 08044ecef7..3e290c8473 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -323,6 +323,8 @@ updwtmp updwtmpx utimensat vsyslog _write __write __xstat
conf.env.build_winbind = True
conf.DEFINE('WITH_WINBIND', '1')
+ conf.find_program('awk', var='AWK')
+
#FIXME: Should just be set when krb5 and ldap requirements are fulfilled
if Options.options.with_ads:
conf.DEFINE('WITH_ADS', '1')
diff --git a/source3/wscript_build b/source3/wscript_build
index 72ff748fbe..2c74bf104a 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -773,8 +773,6 @@ EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}
LIBS='ICONV'
-bld.env.AWK = 'gawk'
-
bld.SAMBA_GENERATOR('build_options',
source='include/config.h script/mkbuildoptions.awk',
target='smbd/build_options.c',