зеркало из https://github.com/mozilla/gecko-dev.git
Automated update
This commit is contained in:
Родитель
1cc4fac6b0
Коммит
b418206f03
|
@ -13297,11 +13297,11 @@ if test "$MOZ_DEBUG" || test "$NS_TRACE_MALLOC"; then
|
|||
fi
|
||||
|
||||
if test "$MOZ_LDAP_XPCOM"; then
|
||||
LDAP_CFLAGS='-I${DIST}/include/ldap'
|
||||
LDAP_CFLAGS='-I${DIST}/public/ldap'
|
||||
if test "$_WIN32_MSVC"; then
|
||||
LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v40.${LIB_SUFFIX}'
|
||||
LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v50.${LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)/nsldappr32v50.${LIB_SUFFIX}'
|
||||
else
|
||||
LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap40 -llber40'
|
||||
LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap50 -llber50 -lprldap50'
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@ -14375,24 +14375,24 @@ rm -f build/unix/mozilla-config.bak
|
|||
#
|
||||
if test "$MOZ_LDAP_XPCOM"; then
|
||||
|
||||
# these subdirs may not yet have been created in the build tree.
|
||||
# don't use the "-p" switch to mkdir, since not all platforms have it
|
||||
#
|
||||
if test ! -d "directory"; then
|
||||
mkdir "directory"
|
||||
fi
|
||||
if test ! -d "directory/c-sdk"; then
|
||||
mkdir "directory/c-sdk"
|
||||
fi
|
||||
if test ! -d "directory/c-sdk/ldap"; then
|
||||
mkdir "directory/c-sdk/ldap"
|
||||
fi
|
||||
# these subdirs may not yet have been created in the build tree.
|
||||
# don't use the "-p" switch to mkdir, since not all platforms have it
|
||||
#
|
||||
if test ! -d "directory"; then
|
||||
mkdir "directory"
|
||||
fi
|
||||
if test ! -d "directory/c-sdk"; then
|
||||
mkdir "directory/c-sdk"
|
||||
fi
|
||||
if test ! -d "directory/c-sdk/ldap"; then
|
||||
mkdir "directory/c-sdk/ldap"
|
||||
fi
|
||||
|
||||
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist"
|
||||
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --without-nss"
|
||||
if test -n "$HAVE_64BIT_OS"; then
|
||||
ac_configure_args="$ac_configure_args --enable-64bit"
|
||||
fi
|
||||
|
||||
|
||||
if test "$no_recursion" != yes; then
|
||||
|
||||
# Remove --cache-file and --srcdir arguments so they do not pile up.
|
||||
|
@ -14418,7 +14418,7 @@ if test "$no_recursion" != yes; then
|
|||
esac
|
||||
done
|
||||
|
||||
for ac_config_dir in directory/c-sdk/ldap; do
|
||||
for ac_config_dir in directory/c-sdk; do
|
||||
|
||||
# Do not complain, so a configure script can configure whichever
|
||||
# parts of a large source tree are present.
|
||||
|
|
Загрузка…
Ссылка в новой задаче