From fbe7ed79b0f056a9a8f44a9b42e887441d2f00d5 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 21 Oct 2011 13:18:25 +0200 Subject: dynconfig: replace #if (_SAMBA_BUILD_ >= 4) by feature tests metze --- dynconfig/dynconfig.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'dynconfig') diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c index 4bcdab3596..79332a226d 100644 --- a/dynconfig/dynconfig.c +++ b/dynconfig/dynconfig.c @@ -107,11 +107,19 @@ DEFINE_DYN_CONFIG_PARAM(DATADIR) DEFINE_DYN_CONFIG_PARAM(SETUPDIR) DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR) /* from winbind_struct_protocol.h in s3 autoconf */ -/* these are not in s3 */ -#if (_SAMBA_BUILD_ >= 4) +/* these are not used in s3 */ +#ifdef WINBINDD_PRIVILEGED_SOCKET_DIR DEFINE_DYN_CONFIG_PARAM(WINBINDD_PRIVILEGED_SOCKET_DIR) +#endif +#ifdef NTP_SIGND_SOCKET_DIR DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR) +#endif +#ifdef PYTHONDIR DEFINE_DYN_CONFIG_PARAM(PYTHONDIR) +#endif +#ifdef PYTHONARCHDIR DEFINE_DYN_CONFIG_PARAM(PYTHONARCHDIR) +#endif +#ifdef SCRIPTSBINDIR DEFINE_DYN_CONFIG_PARAM(SCRIPTSBINDIR) #endif -- cgit