From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 16 Jun 2015 23:50:01 +0000 (-0400)
Subject: Build with sasl.c if necessary
X-Git-Tag: release_3_0_9~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b340b1b01300f7e52fa5dcaac97f9dcdc1fec031;p=thirdparty%2Ffreeradius-server.git

Build with sasl.c if necessary
---

diff --git a/src/modules/rlm_ldap/all.mk.in b/src/modules/rlm_ldap/all.mk.in
index 0855a084a20..daa64ecf524 100644
--- a/src/modules/rlm_ldap/all.mk.in
+++ b/src/modules/rlm_ldap/all.mk.in
@@ -4,7 +4,7 @@ ifneq "$(TARGETNAME)" ""
 TARGET		:= $(TARGETNAME).a
 endif
 
-SOURCES		:= $(TARGETNAME).c attrmap.c ldap.c clients.c groups.c edir.c
+SOURCES		:= $(TARGETNAME).c attrmap.c ldap.c clients.c groups.c edir.c @SASL@
 
 SRC_CFLAGS	:= @mod_cflags@
 TGT_LDLIBS	:= @mod_ldflags@
diff --git a/src/modules/rlm_ldap/configure b/src/modules/rlm_ldap/configure
index 7a6cf23eb31..2675abe9646 100755
--- a/src/modules/rlm_ldap/configure
+++ b/src/modules/rlm_ldap/configure
@@ -586,6 +586,7 @@ ac_unique_file="rlm_ldap.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 targetname
+SASL
 mod_cflags
 mod_ldflags
 OBJEXT
@@ -3186,6 +3187,14 @@ _ACEOF
 mod_ldflags=$SMART_LIBS
 mod_cflags="$SMART_CPPFLAGS"
 
+if test x"$ac_cv_func_ldap_sasl_interactive_bind" = "xyes"; then
+	SASL=sasl.c
+else
+	SASL=
+fi
+
+
+
 
 
 ac_config_headers="$ac_config_headers config.h"
diff --git a/src/modules/rlm_ldap/configure.ac b/src/modules/rlm_ldap/configure.ac
index 8bdcf48d171..20215caf899 100644
--- a/src/modules/rlm_ldap/configure.ac
+++ b/src/modules/rlm_ldap/configure.ac
@@ -132,8 +132,16 @@ AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, ${ac_cv_ldap_set_rebind_proc}, [Nu
 
 mod_ldflags=$SMART_LIBS
 mod_cflags="$SMART_CPPFLAGS"
+
+if test x"$ac_cv_func_ldap_sasl_interactive_bind" = "xyes"; then
+	SASL=sasl.c
+else
+	SASL=
+fi
+
 AC_SUBST(mod_ldflags)
 AC_SUBST(mod_cflags)
+AC_SUBST(SASL)
 AC_SUBST(targetname)
 AC_CONFIG_HEADER(config.h)
 AC_OUTPUT(all.mk)