Attachment #49752 for bug #79864

View | Details | Raw Unified | Return to bug 79864
Collapse All | Expand All




# saslauthd configure script --help
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 This flag also changes the requirements of --with-mysql and --with-pgsql




gssapiv2_version = 2:20:0
crammd5_version = 2:20:0
sasldb_version = 2:20:0
ldapdb_version = 2:20:0
login_version = 2:20:0
plain_version = 2:20:0
ntlm_version = 2:20:0

sql_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
AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)


noinst_SCRIPTS = makeinit.sh

LIB_MYSQL = @LIB_MYSQL@
LDAP_LIBS = @LDAP_LIBS@

plugindir = @plugindir@


sasl_LTLIBRARIES = @SASL_MECHS@
EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
	libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
	libntlm.la libsasldb.la libldapdb.la libsql.la

libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
libplain_la_LDFLAGS = -version-info $(plain_version)

libsasldb_la_DEPENDENCIES = $(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_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) -version-info $(sql_version)
libsql_la_DEPENDENCIES = $(COMPAT_OBJS)

Return to bug 79864

Lines 551-556 Link Here

(-)srctree-orig/configure.in (+28 lines)
551	# saslauthd configure script --help	551	# saslauthd configure script --help
552	AC_ARG_WITH(ldap, [ --with-ldap=DIR use LDAP (in DIR) for saslauthd [no] ],,)	552	AC_ARG_WITH(ldap, [ --with-ldap=DIR use LDAP (in DIR) for saslauthd [no] ],,)
553		553
		554	# hack in support for ldapdb plugin
		555	AC_ARG_ENABLE(ldapdb, [ --enable-ldapdb enable ldapdb auxprop plugin [no]],
		556	ldapdb=$enableval,
		557	ldapdb=no)
		558
		559	AC_MSG_CHECKING(LDAPDB)
		560	if test "$ldapdb" != no; then
		561
		562	SASL_MECHS="$SASL_MECHS libldapdb.la"
		563	if test "$enable_static" = yes; then
		564	SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/ldapdb.o"
		565	AC_DEFINE(STATIC_LDAP,[],[Link LDAP plugin staticly])
		566	fi
		567	AC_MSG_RESULT(enabled)
		568	else
		569	AC_MSG_RESULT(disabled)
		570	fi
		571
		572	LDAP_LIBS=""
		573	if test "$ldapdb" != no; then
		574	AC_CHECK_LIB(ldap, ldap_initialize, [ AC_DEFINE(HAVE_LDAP,[],[Support for LDAP?])
		575	LDAP_LIBS="-lldap -llber"
		576	if test "$with_openssl" != "no"; then
		577	LDAP_LIBS="$LDAP_LIBS -lcrypto $LIB_RSAREF"
		578	fi],,-llber)
		579
		580	fi
		581	AC_SUBST(LDAP_LIBS)
554		582
555	dnl SQL	583	dnl SQL
556	dnl This flag also changes the requirements of --with-mysql and --with-pgsql	584	dnl This flag also changes the requirements of --with-mysql and --with-pgsql

Lines 52-57 Link Here

(-)srctree-orig/plugins/Makefile.am (-1 / +9 lines)
52	gssapiv2_version = 2:20:0	52	gssapiv2_version = 2:20:0
53	crammd5_version = 2:20:0	53	crammd5_version = 2:20:0
54	sasldb_version = 2:20:0	54	sasldb_version = 2:20:0
		55	ldapdb_version = 2:20:0
55	login_version = 2:20:0	56	login_version = 2:20:0
56	plain_version = 2:20:0	57	plain_version = 2:20:0
57	ntlm_version = 2:20:0	58	ntlm_version = 2:20:0
Lines 59-64 Link Here
59	sql_version = 2:20:0	60	sql_version = 2:20:0
60	srp_version = 2:20:0	61	srp_version = 2:20:0
61		62
		63
62	INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include	64	INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
63	AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)	65	AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
64		66
Lines 68-73 Link Here
68	noinst_SCRIPTS = makeinit.sh	70	noinst_SCRIPTS = makeinit.sh
69		71
70	LIB_MYSQL = @LIB_MYSQL@	72	LIB_MYSQL = @LIB_MYSQL@
		73	LDAP_LIBS = @LDAP_LIBS@
71		74
72	plugindir = @plugindir@	75	plugindir = @plugindir@
73		76
Lines 77-83 Link Here
77	sasl_LTLIBRARIES = @SASL_MECHS@	80	sasl_LTLIBRARIES = @SASL_MECHS@
78	EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \	81	EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
79	libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \	82	libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
80	libntlm.la libsasldb.la libsql.la	83	libntlm.la libsasldb.la libldapdb.la libsql.la
81		84
82	libplain_la_SOURCES = plain.c plain_init.c $(common_sources)	85	libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
83	libplain_la_LDFLAGS = -version-info $(plain_version)	86	libplain_la_LDFLAGS = -version-info $(plain_version)
Lines 135-140 Link Here
135	libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)	138	libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
136	libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)	139	libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
137		140
		141	libldapdb_la_SOURCES = ldapdb.c $(common_sources)
		142	libldapdb_la_LDFLAGS = $(LDAP_LIBS) -version-info $(ldapdb_version)
		143	libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
		144	libldapdb_la_LIBADD = $(COMPAT_OBJS)
		145
138	libsql_la_SOURCES = sql.c sql_init.c $(common_sources)	146	libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
139	libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) -version-info $(sql_version)	147	libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) -version-info $(sql_version)
140	libsql_la_DEPENDENCIES = $(COMPAT_OBJS)	148	libsql_la_DEPENDENCIES = $(COMPAT_OBJS)