mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-03 05:47:29 +09:00
Issue #1258 - Part 2: Use binoc-central version of ldap
This commit is contained in:
Matt A. Tobin
Roy Tam
parent
e400f4130a
commit
deb86ab699
94 changed files with 44 additions and 18 deletions
|
|
@ -3,7 +3,7 @@
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
include('/ldap/ldap-sdk.mozbuild')
|
include('../common.mozbuild')
|
||||||
|
|
||||||
Library('lber60')
|
Library('lber60')
|
||||||
|
|
||||||
|
|
@ -18,6 +18,6 @@ DEFINES['USE_WAITPID'] = True
|
||||||
DEFINES['NEEDPROTOS'] = True
|
DEFINES['NEEDPROTOS'] = True
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
'/ldap/c-sdk/include'
|
'../include'
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
include('/ldap/ldap-sdk.mozbuild')
|
include('../common.mozbuild')
|
||||||
|
|
||||||
SharedLibrary('ldap60')
|
SharedLibrary('ldap60')
|
||||||
|
|
||||||
|
|
@ -82,7 +82,7 @@ if CONFIG['OS_TARGET'] != 'WINNT':
|
||||||
DEFINES['NEEDPROTOS'] = True
|
DEFINES['NEEDPROTOS'] = True
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
'/ldap/c-sdk/include'
|
'../include'
|
||||||
]
|
]
|
||||||
|
|
||||||
USE_LIBS += ['lber60']
|
USE_LIBS += ['lber60']
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
include('/ldap/ldap-sdk.mozbuild')
|
include('../common.mozbuild')
|
||||||
|
|
||||||
SharedLibrary('ldif60')
|
SharedLibrary('ldif60')
|
||||||
|
|
||||||
|
|
@ -12,7 +12,7 @@ SOURCES += [
|
||||||
]
|
]
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
'/ldap/c-sdk/include'
|
'../include'
|
||||||
]
|
]
|
||||||
|
|
||||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
include('/ldap/ldap-sdk.mozbuild')
|
include('../common.mozbuild')
|
||||||
|
|
||||||
SharedLibrary('prldap60')
|
SharedLibrary('prldap60')
|
||||||
|
|
||||||
|
|
@ -22,7 +22,7 @@ DEFINES['USE_WAITPID'] = True
|
||||||
DEFINES['NEEDPROTOS'] = True
|
DEFINES['NEEDPROTOS'] = True
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
'/ldap/c-sdk/include'
|
'../include'
|
||||||
]
|
]
|
||||||
|
|
||||||
USE_LIBS += [
|
USE_LIBS += [
|
||||||
|
|
@ -3,9 +3,17 @@
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
|
Library('ldapsdks')
|
||||||
|
|
||||||
DIRS += [
|
DIRS += [
|
||||||
'liblber',
|
'liblber',
|
||||||
'libldif',
|
'libldif',
|
||||||
'libldap',
|
'libldap',
|
||||||
'libprldap'
|
'libprldap'
|
||||||
]
|
]
|
||||||
|
|
||||||
|
USE_LIBS += [
|
||||||
|
'ldap60',
|
||||||
|
'ldif60',
|
||||||
|
'prldap60',
|
||||||
|
]
|
||||||
|
|
@ -3,14 +3,7 @@
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
Library('ldapsdks')
|
|
||||||
|
|
||||||
DIRS += [
|
DIRS += [
|
||||||
'c-sdk/libraries'
|
'c-sdk',
|
||||||
]
|
'xpcom'
|
||||||
|
|
||||||
USE_LIBS += [
|
|
||||||
'ldap60',
|
|
||||||
'ldif60',
|
|
||||||
'prldap60',
|
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,6 @@ else:
|
||||||
FINAL_LIBRARY = 'xul'
|
FINAL_LIBRARY = 'xul'
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
'/ldap/c-sdk/include',
|
'../../c-sdk/include',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -723,3 +723,28 @@ nsLDAPURL::GetHasRef(bool *result)
|
||||||
{
|
{
|
||||||
return mBaseURL->GetHasRef(result);
|
return mBaseURL->GetHasRef(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
NS_IMETHODIMP
|
||||||
|
nsLDAPURL::GetFilePath(nsACString &aFilePath)
|
||||||
|
{
|
||||||
|
return mBaseURL->GetFilePath(aFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
NS_IMETHODIMP
|
||||||
|
nsLDAPURL::SetFilePath(const nsACString &aFilePath)
|
||||||
|
{
|
||||||
|
return mBaseURL->SetFilePath(aFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
NS_IMETHODIMP
|
||||||
|
nsLDAPURL::GetQuery(nsACString &aQuery)
|
||||||
|
{
|
||||||
|
return mBaseURL->GetQuery(aQuery);
|
||||||
|
}
|
||||||
|
|
||||||
|
NS_IMETHODIMP
|
||||||
|
nsLDAPURL::SetQuery(const nsACString &aQuery)
|
||||||
|
{
|
||||||
|
return mBaseURL->SetQuery(aQuery);
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue