From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 22 May 2013 06:23:23 +0000 (+1000)
Subject: build: Remove feature tests for variables now always provided
X-Git-Tag: tdb-1.2.12~50
X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=4c4520ac3794f917c831255d6598945712bcfb5c

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>
---

diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c
index 9fd7108da4f..5f672787187 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