summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-21 13:18:25 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-22 09:28:26 +0200
commitfbe7ed79b0f056a9a8f44a9b42e887441d2f00d5 (patch)
treeb68cf030857f223aea7b6fcb2840994319a22ac5
parent04fd3a9d696c4f7ada2b37297a92e25f8210211d (diff)
downloadsamba-fbe7ed79b0f056a9a8f44a9b42e887441d2f00d5.tar.gz
samba-fbe7ed79b0f056a9a8f44a9b42e887441d2f00d5.tar.bz2
samba-fbe7ed79b0f056a9a8f44a9b42e887441d2f00d5.zip
dynconfig: replace #if (_SAMBA_BUILD_ >= 4) by feature tests
metze
-rw-r--r--dynconfig/dynconfig.c12
1 files changed, 10 insertions, 2 deletions
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