Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
ecfc2c15
Commit
ecfc2c15
authored
19 years ago
by
Hans Leidekker
Committed by
Alexandre Julliard
19 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Link to the reentrant version of libldap.
parent
83befb5d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure
+11
-11
11 additions, 11 deletions
configure
configure.ac
+4
-2
4 additions, 2 deletions
configure.ac
with
15 additions
and
13 deletions
configure
+
11
−
11
View file @
ecfc2c15
...
...
@@ -9615,13 +9615,13 @@ LDAPLIBS=""
if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes"
then
echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5
echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6
if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
echo "$as_me:$LINENO: checking for ldap_initialize in -lldap
_r
" >&5
echo $ECHO_N "checking for ldap_initialize in -lldap
_r
... $ECHO_C" >&6
if test "${ac_cv_lib_ldap_
r_
ldap_initialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lldap
$LIBS"
LIBS="-lldap
_r $LIBPTHREAD
$LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
...
...
@@ -9665,27 +9665,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_ldap_ldap_initialize=yes
ac_cv_lib_ldap_
r_
ldap_initialize=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_ldap_ldap_initialize=no
ac_cv_lib_ldap_
r_
ldap_initialize=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5
echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6
if test $ac_cv_lib_ldap_ldap_initialize = yes; then
echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_
r_
ldap_initialize" >&5
echo "${ECHO_T}$ac_cv_lib_ldap_
r_
ldap_initialize" >&6
if test $ac_cv_lib_ldap_
r_
ldap_initialize = yes; then
echo "$as_me:$LINENO: checking for ber_init in -llber" >&5
echo $ECHO_N "checking for ber_init in -llber... $ECHO_C" >&6
if test "${ac_cv_lib_lber_ber_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-llber $LIBS"
LIBS="-llber
$LIBPTHREAD
$LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
...
...
@@ -9748,7 +9748,7 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_LDAP 1
_ACEOF
LDAPLIBS="-lldap -llber"
LDAPLIBS="-lldap
_r
-llber"
fi
fi
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
4
−
2
View file @
ecfc2c15
...
...
@@ -545,10 +545,12 @@ dnl **** Check for OpenLDAP ***
AC_SUBST(LDAPLIBS,"")
if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes"
then
AC_CHECK_LIB(ldap, ldap_initialize,
AC_CHECK_LIB(ldap
_r
, ldap_initialize,
[AC_CHECK_LIB(lber, ber_init,
[AC_DEFINE(HAVE_LDAP, 1, [Define if you have the OpenLDAP development environment])
LDAPLIBS="-lldap -llber"])])
LDAPLIBS="-lldap_r -llber"],,
[$LIBPTHREAD])],,
[$LIBPTHREAD])
fi
dnl **** Check for FreeType 2 ****
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment