summaryrefslogtreecommitdiff
path: root/lib/replace/wscript
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-06-11 09:11:17 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-14 09:34:14 +0200
commitdeca298d7b5651276ab7cd8bcb3090a2a4946d79 (patch)
tree459b06b797b64122d691d7b2efc02fab114e6e1e /lib/replace/wscript
parent0a92ac2ddc8d27c70d3399610c51d1ed65564239 (diff)
downloadsamba-deca298d7b5651276ab7cd8bcb3090a2a4946d79.tar.gz
samba-deca298d7b5651276ab7cd8bcb3090a2a4946d79.tar.bz2
samba-deca298d7b5651276ab7cd8bcb3090a2a4946d79.zip
lib/replace: define HAVE_WORKING_STRPTIME instead of REPLACE_STRPTIME
That makes the logic in 'wscript' simpler. metze
Diffstat (limited to 'lib/replace/wscript')
-rw-r--r--lib/replace/wscript19
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 743b5fe632..7e4055ba9a 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -311,13 +311,14 @@ removeea setea
conf.CHECK_HEADERS('poll.h')
conf.CHECK_FUNCS('poll')
- if not conf.CHECK_CODE('''#define LIBREPLACE_CONFIGURE_TEST_STRPTIME
- #include "test/strptime.c"''',
- define='HAVE_STRPTIME',
- execute=True,
- addmain=False,
- msg='Checking for working strptime'):
- conf.DEFINE('REPLACE_STRPTIME', 1)
+ conf.CHECK_FUNCS('strptime')
+ conf.CHECK_DECLS('strptime', headers='time.h')
+ conf.CHECK_CODE('''#define LIBREPLACE_CONFIGURE_TEST_STRPTIME
+ #include "test/strptime.c"''',
+ define='HAVE_WORKING_STRPTIME',
+ execute=True,
+ addmain=False,
+ msg='Checking for working strptime')
conf.CHECK_CODE('gettimeofday(NULL, NULL)', 'HAVE_GETTIMEOFDAY_TZ', execute=False)
@@ -460,6 +461,9 @@ REPLACEMENT_FUNCTIONS = {
# Note: C99_VSNPRINTF is not a function, but a special condition
# for replacement
'snprintf.c': ['C99_VSNPRINTF', 'snprintf', 'vsnprintf', 'asprintf', 'vasprintf'],
+ # Note: WORKING_STRPTIME is not a function, but a special condition
+ # for replacement
+ 'strptime.c': ['WORKING_STRPTIME', 'strptime'],
}
@@ -468,7 +472,6 @@ def build(bld):
REPLACE_HOSTCC_SOURCE = ''
- if bld.CONFIG_SET('REPLACE_STRPTIME'): REPLACE_HOSTCC_SOURCE += ' strptime.c'
for filename, functions in REPLACEMENT_FUNCTIONS.iteritems():
for function in functions:
if not bld.CONFIG_SET('HAVE_%s' % function.upper()):