# HG changeset patch
# User Jiri Kukacka <jiri.kukacka@oracle.com>
# Date 1399479797 25200
# Node ID 3ec7a361fb23eb96ce6dc15db5c3fd351ee5db19
# Parent  6085605fd300a51037900f3df3246d92bd3a1a40
15549572 SUNBT6818271 lighttpd should provide ldap auth support
18873051 Remove hotfix applied in 18172887 due to 18195512

diff -r 6085605fd300 -r 3ec7a361fb23 components/lighttpd/Makefile
--- a/components/lighttpd/Makefile	Wed Jun 04 07:24:02 2014 -0700
+++ b/components/lighttpd/Makefile	Wed May 07 09:23:17 2014 -0700
@@ -61,8 +61,9 @@
 CONFIGURE_OPTIONS +=	--with-lua
 CONFIGURE_OPTIONS +=	--with-openssl
 CONFIGURE_OPTIONS +=	--with-pcre
+CONFIGURE_OPTIONS +=	--with-ldap
 CONFIGURE_OPTIONS +=	--with-mysql=/usr/mysql/5.5/bin/mysql_config
-CONFIGURE_OPTIONS +=    CFLAGS="$(CFLAGS) -R/usr/mysql/5.5/lib/$(MACH64)"
+CONFIGURE_OPTIONS +=    CFLAGS="$(CFLAGS) -I/usr/include/openldap -lldap_r-2.4"
 CONFIGURE_OPTIONS +=    PCRECONFIG="/usr/bin/$(MACH64)/pcre-config"
 
 # Enable ASLR for this component
diff -r 6085605fd300 -r 3ec7a361fb23 components/lighttpd/resolve.deps
--- a/components/lighttpd/resolve.deps	Wed Jun 04 07:24:02 2014 -0700
+++ b/components/lighttpd/resolve.deps	Wed May 07 09:23:17 2014 -0700
@@ -1,5 +1,6 @@
 compress/bzip2
 database/mysql-55/library
+library/openldap
 library/pcre
 library/security/openssl
 library/security/openssl/openssl-fips-140