Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 417687 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.in (-1 / +1 lines)
Lines 6741-6747 Link Here
6741
    elif test "$OS_ARCH" = "OS2"; then
6741
    elif test "$OS_ARCH" = "OS2"; then
6742
            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)ldif60.${IMPORT_LIB_SUFFIX}'
6742
            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)ldif60.${IMPORT_LIB_SUFFIX}'
6743
    else
6743
    else
6744
        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
6744
        LDAP_LIBS='-L${DIST}/bin $(call EXPAND_LIBNAME_PATH,mozldap60,$(DIST)/lib) $(call EXPAND_LIBNAME_PATH,mozprldap60,$(DIST)/lib) $(call EXPAND_LIBNAME_PATH,mozldif60,$(DIST)/lib)'
6745
    fi
6745
    fi
6746
6746
6747
    dnl export LDAP_LIBS so that confvars.sh can pick it up, so when we get to
6747
    dnl export LDAP_LIBS so that confvars.sh can pick it up, so when we get to
(-)a/ldap/sdks/c-sdk/build.mk (-3 / +3 lines)
Lines 67-73 Link Here
67
ifeq ($(OS_ARCH), WINNT)
67
ifeq ($(OS_ARCH), WINNT)
68
LDAP_LIBNAME	= nsldap32v$(LDAPVERS)
68
LDAP_LIBNAME	= nsldap32v$(LDAPVERS)
69
else
69
else
70
LDAP_LIBNAME	= ldap$(LDAPVERS)
70
LDAP_LIBNAME	= mozldap$(LDAPVERS)
71
endif
71
endif
72
DIR_VERSION     = $(LDAPVERS_SUFFIX)
72
DIR_VERSION     = $(LDAPVERS_SUFFIX)
73
DIRSDK_VERSION  = $(LDAPVERS_SUFFIX)
73
DIRSDK_VERSION  = $(LDAPVERS_SUFFIX)
Lines 76-82 Link Here
76
ifeq ($(OS_ARCH), WINNT)
76
ifeq ($(OS_ARCH), WINNT)
77
PRLDAP_LIBNAME	= nsldappr32v$(PRLDAPVERS)
77
PRLDAP_LIBNAME	= nsldappr32v$(PRLDAPVERS)
78
else
78
else
79
PRLDAP_LIBNAME	= prldap$(PRLDAPVERS)
79
PRLDAP_LIBNAME	= mozprldap$(PRLDAPVERS)
80
endif
80
endif
81
81
82
# lber library
82
# lber library
Lines 90-96 Link Here
90
ifeq ($(OS_ARCH), WINNT)
90
ifeq ($(OS_ARCH), WINNT)
91
LDIF_LIBNAME	= nsldif32v$(LDIFVERS)
91
LDIF_LIBNAME	= nsldif32v$(LDIFVERS)
92
else
92
else
93
LDIF_LIBNAME	= ldif$(LDIFVERS)
93
LDIF_LIBNAME	= mozldif$(LDIFVERS)
94
endif
94
endif
95
95
96
# iutil library
96
# iutil library
(-)a/mail/installer/package-manifest.in (-3 / +3 lines)
Lines 270-278 Link Here
270
@BINPATH@/nsldappr32v60@DLL_SUFFIX@
270
@BINPATH@/nsldappr32v60@DLL_SUFFIX@
271
@BINPATH@/nsldif32v60@DLL_SUFFIX@
271
@BINPATH@/nsldif32v60@DLL_SUFFIX@
272
#else
272
#else
273
@BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@
273
@BINPATH@/@DLL_PREFIX@mozldap60@DLL_SUFFIX@
274
@BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@
274
@BINPATH@/@DLL_PREFIX@mozldif60@DLL_SUFFIX@
275
@BINPATH@/@DLL_PREFIX@prldap60@DLL_SUFFIX@
275
@BINPATH@/@DLL_PREFIX@mozprldap60@DLL_SUFFIX@
276
#endif
276
#endif
277
277
278
; login manager
278
; login manager

Return to bug 417687