View | Details | Raw Unified
Collapse All | Expand All

(-) srctree-orig/configure.in (+28 lines)
 Lines 551-556    Link Here  
# saslauthd configure script --help
# saslauthd configure script --help
AC_ARG_WITH(ldap,   [  --with-ldap=DIR         use LDAP (in DIR) for saslauthd [no] ],,)
AC_ARG_WITH(ldap,   [  --with-ldap=DIR         use LDAP (in DIR) for saslauthd [no] ],,)

            

              
              
# hack in support for ldapdb plugin

            

            

              
              
AC_ARG_ENABLE(ldapdb, [  --enable-ldapdb         enable ldapdb auxprop plugin [no]],

            

            

              
              
	ldapdb=$enableval,

            

            

              
              
	ldapdb=no)

            

            

              
              

            

            

              
              
AC_MSG_CHECKING(LDAPDB)

            

            

              
              
if test "$ldapdb" != no; then

            

            

              
              

            

            

              
              
	SASL_MECHS="$SASL_MECHS libldapdb.la"

            

            

              
              
  if test "$enable_static" = yes; then

            

            

              
              
    SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/ldapdb.o"

            

            

              
              
    AC_DEFINE(STATIC_LDAP,[],[Link LDAP plugin staticly])

            

            

              
              
  fi

            

            

              
              
	AC_MSG_RESULT(enabled)

            

            

              
              
else

            

            

              
              
	AC_MSG_RESULT(disabled)

            

            

              
              
fi

            

            

              
              

            

            

              
              
LDAP_LIBS=""

            

            

              
              
if test "$ldapdb" != no; then

            

            

              
              
  AC_CHECK_LIB(ldap, ldap_initialize, [ AC_DEFINE(HAVE_LDAP,[],[Support for LDAP?])

            

            

              
              
                                        LDAP_LIBS="-lldap -llber"

            

            

              
              
          if test "$with_openssl" != "no"; then

            

            

              
              
              LDAP_LIBS="$LDAP_LIBS -lcrypto $LIB_RSAREF"

            

            

              
              
          fi],,-llber)

            

            

              
              

            

            

              
              
fi

            

            

              
              
AC_SUBST(LDAP_LIBS)

            

        

        
dnl SQL
dnl SQL

        
dnl This flag also changes the requirements of --with-mysql and --with-pgsql
dnl This flag also changes the requirements of --with-mysql and --with-pgsql



(-) srctree-orig/plugins/Makefile.am
      (-1 / +9 lines)




  

    

    

       Lines 52-57
       
    
  Link Here 
    

  

        
gssapiv2_version = 2:20:0
gssapiv2_version = 2:20:0

        
crammd5_version = 2:20:0
crammd5_version = 2:20:0

        
sasldb_version = 2:20:0
sasldb_version = 2:20:0

            

              
              
ldapdb_version = 2:20:0

            

        
login_version = 2:20:0
login_version = 2:20:0

        
plain_version = 2:20:0
plain_version = 2:20:0

        
ntlm_version = 2:20:0
ntlm_version = 2:20:0

  

    

    

       Lines 59-64
       
    
  Link Here 
    

  

        
sql_version = 2:20:0
sql_version = 2:20:0

        
srp_version = 2:20:0
srp_version = 2:20:0

        

            

              
              

            

        
INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include

        
AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)

        

  

    

    

       Lines 68-73
       
    
  Link Here 
    

  

        
noinst_SCRIPTS = makeinit.sh
noinst_SCRIPTS = makeinit.sh

        

        
LIB_MYSQL = @LIB_MYSQL@
LIB_MYSQL = @LIB_MYSQL@

            

              
              
LDAP_LIBS = @LDAP_LIBS@

            

        

        
plugindir = @plugindir@
plugindir = @plugindir@

        

  

    

    

       Lines 77-83
       
    
  Link Here 
    

  

        
sasl_LTLIBRARIES = @SASL_MECHS@
sasl_LTLIBRARIES = @SASL_MECHS@

        
EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \

        
	libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
	libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \

            

              
	libntlm.la libsasldb.la libsql.la

              
	libntlm.la libsasldb.la libldapdb.la libsql.la

            

        

        
libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
libplain_la_SOURCES = plain.c plain_init.c $(common_sources)

        
libplain_la_LDFLAGS = -version-info $(plain_version)
libplain_la_LDFLAGS = -version-info $(plain_version)

  

    

    

       Lines 135-140
       
    
  Link Here 
    

  

        
libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)

        
libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)

        

            

              
              
libldapdb_la_SOURCES = ldapdb.c $(common_sources)

            

            

              
              
libldapdb_la_LDFLAGS = $(LDAP_LIBS) -version-info $(ldapdb_version)

            

            

              
              
libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)

            

            

              
              
libldapdb_la_LIBADD = $(COMPAT_OBJS)

            

            

              
              

            

        
libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
libsql_la_SOURCES = sql.c sql_init.c $(common_sources)

        
libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) -version-info $(sql_version)
libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) -version-info $(sql_version)

        
libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
libsql_la_DEPENDENCIES = $(COMPAT_OBJS)