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