dynconfig: replace #if (_SAMBA_BUILD_ >= 4) by feature tests

metze

diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c
index 4bcdab35961dd8a041f99e928759123c3b66b08a..79332a226d6677e2076e8afdda8b7507da0644ee 100644 (file)
--- 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