summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-05-22 16:23:23 +1000
committerAndrew Bartlett <abartlet@samba.org>2013-05-28 12:17:12 +1000
commit4c4520ac3794f917c831255d6598945712bcfb5c (patch)
tree7260489fd174b0a49e190f7b4d384df46bf94cce
parentdc6b03ffa55968708576cb527f1b52a37d8e5317 (diff)
downloadsamba-4c4520ac3794f917c831255d6598945712bcfb5c.tar.gz
samba-4c4520ac3794f917c831255d6598945712bcfb5c.tar.bz2
samba-4c4520ac3794f917c831255d6598945712bcfb5c.zip
build: Remove feature tests for variables now always provided
These #ifdef statements were added in replacement for #if (_SAMBA_BUILD_ >= 4) in fbe7ed79b0f056a9a8f44a9b42e887441d2f00d5 Andrew Bartlett Reviewed-by: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: David Disseldorp <ddiss@samba.org>
-rw-r--r--dynconfig/dynconfig.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c
index 9fd7108da4..5f67278718 100644
--- a/dynconfig/dynconfig.c
+++ b/dynconfig/dynconfig.c
@@ -106,19 +106,8 @@ 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 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