diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2018-07-04 02:52:06 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2018-07-04 02:52:06 -0600 |
| commit | 0fd556115af6899df930f5e991f785cb8f2a58b5 (patch) | |
| tree | d3f2dc17812f05b01b6b612f401f096a299f17f4 /imap | |
| parent | d62818ea54f7847a8d2c8d2e15849769d821f2a6 (diff) | |
| download | alpine-0fd556115af6899df930f5e991f785cb8f2a58b5.tar.xz | |
* Kerberos was included twice in OSX due to a double definition of gss
coming from the configure script and imap/Makefile. Remove the double
definition from imap/Makefile. Reported and patched by Wang Kang.
Diffstat (limited to 'imap')
| -rw-r--r-- | imap/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/imap/Makefile b/imap/Makefile index f696afba..c98d48dd 100644 --- a/imap/Makefile +++ b/imap/Makefile @@ -417,21 +417,20 @@ osi: an oxp: an $(TOUCH) ip6 - $(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \ + $(BUILD) BUILDTYPE=osx IP=$(IP6) \ PASSWDTYPE=pam \ EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1" \ SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMDLFLAGS=-lpam" oxs: an $(TOUCH) ip6 - $(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \ + $(BUILD) BUILDTYPE=osx IP=$(IP6) \ PASSWDTYPE=pam \ - EXTRACFLAGS="$(EXTRACFLAGS)" \ SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMDLFLAGS=-lpam" osx: osxok an $(TOUCH) ip6 - $(BUILD) BUILDTYPE=$@ IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \ + $(BUILD) BUILDTYPE=$@ IP=$(IP6) \ SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib" osxok: |