From: Timo Sirainen <tss@iki.fi>
Date: Thu, 26 Mar 2009 22:36:36 +0000 (-0400)
Subject: Fixed --with-ldap=plugin and --with-gssapi=plugin
X-Git-Tag: 1.2.rc1~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44fc0a34c39f1ddb3a776918630010867a5dd04e;p=thirdparty%2Fdovecot%2Fcore.git

Fixed --with-ldap=plugin and --with-gssapi=plugin

--HG--
branch : HEAD
---

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index e9e626f178..ae7f52ce4e 100644
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -48,14 +48,6 @@ dovecot_auth_LDADD = \
 
 ldap_sources = db-ldap.c passdb-ldap.c userdb-ldap.c
 
-if ! LDAP_PLUGIN
-builtin_ldap_sources = $(ldap_sources)
-endif
-
-if ! GSSAPI_PLUGIN
-builtin_gssapi_sources = mech-gssapi.c
-endif
-
 dovecot_auth_SOURCES = \
 	auth.c \
 	auth-cache.c \
@@ -77,6 +69,7 @@ dovecot_auth_SOURCES = \
 	mech-login.c \
 	mech-cram-md5.c \
 	mech-digest-md5.c \
+	mech-gssapi.c \
 	mech-ntlm.c \
 	mech-otp.c \
 	mech-skey.c \
@@ -107,8 +100,7 @@ dovecot_auth_SOURCES = \
 	userdb-static.c \
 	userdb-vpopmail.c \
 	userdb-sql.c \
-	$(builtin_gssapi_sources) \
-	$(builtin_ldap_sources)
+	$(ldap_sources)
 
 headers = \
 	auth.h \
@@ -144,14 +136,14 @@ headers = \
 if GSSAPI_PLUGIN
 libmech_gssapi_la_LDFLAGS = -module -avoid-version
 libmech_gssapi_la_LIBADD = $(KRB5_LIBS)
-libmech_gssapi_la_CPPFLAGS = $(AM_CPPFLAGS) $(KRB5_CFLAGS)
+libmech_gssapi_la_CPPFLAGS = $(AM_CPPFLAGS) $(KRB5_CFLAGS) -DPLUGIN_BUILD
 libmech_gssapi_la_SOURCES = mech-gssapi.c
 endif
 
 if LDAP_PLUGIN
 libauthdb_ldap_la_LDFLAGS = -module -avoid-version
 libauthdb_ldap_la_LIBADD = $(LDAP_LIBS)
-libauthdb_ldap_la_CPPFLAGS = $(AM_CPPFLAGS)
+libauthdb_ldap_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_BUILD
 libauthdb_ldap_la_SOURCES = $(ldap_sources)
 endif
 
diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 4f36491dba..b10a947f1e 100644
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -2,7 +2,7 @@
 
 #include "common.h"
 
-#if defined(PASSDB_LDAP) || defined(USERDB_LDAP)
+#if defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD)
 
 #include "network.h"
 #include "ioloop.h"
diff --git a/src/auth/mech-gssapi.c b/src/auth/mech-gssapi.c
index fe61fa4f75..a2b8c8aae3 100644
--- a/src/auth/mech-gssapi.c
+++ b/src/auth/mech-gssapi.c
@@ -23,7 +23,7 @@
 
 #include <stdlib.h>
 
-#ifdef HAVE_GSSAPI
+#if defined(BUILTIN_GSSAPI) || defined(PLUGIN_BUILD)
 
 #ifndef HAVE___GSS_USEROK
 #  define USE_KRB5_USEROK
diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index 64c83dcceb..e28287780f 100644
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -3,7 +3,7 @@
 #include "common.h"
 #include "passdb.h"
 
-#ifdef PASSDB_LDAP
+#if defined(PASSDB_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD))
 
 #include "ioloop.h"
 #include "hash.h"
diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
index 02dc4eea95..9c41fde800 100644
--- a/src/auth/userdb-ldap.c
+++ b/src/auth/userdb-ldap.c
@@ -3,7 +3,7 @@
 #include "common.h"
 #include "userdb.h"
 
-#ifdef USERDB_LDAP
+#if defined(USERDB_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD))
 
 #include "hash.h"
 #include "str.h"