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
Alexey Alyaev
wine
Commits
b2c62c94
Commit
b2c62c94
authored
19 years ago
by
Hans Leidekker
Committed by
Alexandre Julliard
19 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wldap32: Added configure checks for some potentially missing functions.
parent
e0d4df6b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
configure
+111
-0
111 additions, 0 deletions
configure
configure.ac
+8
-0
8 additions, 0 deletions
configure.ac
dlls/wldap32/misc.c
+3
-3
3 additions, 3 deletions
dlls/wldap32/misc.c
dlls/wldap32/parse.c
+1
-1
1 addition, 1 deletion
dlls/wldap32/parse.c
include/config.h.in
+12
-0
12 additions, 0 deletions
include/config.h.in
with
135 additions
and
4 deletions
configure
+
111
−
0
View file @
b2c62c94
...
...
@@ -9755,6 +9755,117 @@ fi
fi
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LDAPLIBS $LIBPTHREAD"
for ac_func in \
ldap_count_references \
ldap_first_reference \
ldap_next_reference \
ldap_parse_reference
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
{
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
char (*f) () = $ac_func;
#endif
#ifdef __cplusplus
}
#endif
int
main ()
{
return f != $ac_func;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
LIBS="$ac_save_LIBS"
fi
FREETYPELIBS=""
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
8
−
0
View file @
b2c62c94
...
...
@@ -552,6 +552,14 @@ then
LDAPLIBS="-lldap_r -llber"],,
[$LIBPTHREAD])],,
[$LIBPTHREAD])
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LDAPLIBS $LIBPTHREAD"
AC_CHECK_FUNCS(\
ldap_count_references \
ldap_first_reference \
ldap_next_reference \
ldap_parse_reference)
LIBS="$ac_save_LIBS"
fi
dnl **** Check for FreeType 2 ****
...
...
This diff is collapsed.
Click to expand it.
dlls/wldap32/misc.c
+
3
−
3
View file @
b2c62c94
...
...
@@ -115,7 +115,7 @@ ULONG WLDAP32_ldap_count_entries( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
ULONG
WLDAP32_ldap_count_references
(
WLDAP32_LDAP
*
ld
,
WLDAP32_LDAPMessage
*
res
)
{
ULONG
ret
=
LDAP_NOT_SUPPORTED
;
#ifdef HAVE_LDAP
#ifdef HAVE_LDAP
_COUNT_REFERENCES
TRACE
(
"(%p, %p)
\n
"
,
ld
,
res
);
...
...
@@ -250,7 +250,7 @@ WLDAP32_LDAPMessage *WLDAP32_ldap_first_entry( WLDAP32_LDAP *ld, WLDAP32_LDAPMes
WLDAP32_LDAPMessage
*
WLDAP32_ldap_first_reference
(
WLDAP32_LDAP
*
ld
,
WLDAP32_LDAPMessage
*
res
)
{
#ifdef HAVE_LDAP
#ifdef HAVE_LDAP
_FIRST_REFERENCE
TRACE
(
"(%p, %p)
\n
"
,
ld
,
res
);
...
...
@@ -367,7 +367,7 @@ WLDAP32_LDAPMessage *WLDAP32_ldap_next_entry( WLDAP32_LDAP *ld, WLDAP32_LDAPMess
WLDAP32_LDAPMessage
*
WLDAP32_ldap_next_reference
(
WLDAP32_LDAP
*
ld
,
WLDAP32_LDAPMessage
*
entry
)
{
#ifdef HAVE_LDAP
#ifdef HAVE_LDAP
_NEXT_REFERENCE
TRACE
(
"(%p, %p)
\n
"
,
ld
,
entry
);
...
...
This diff is collapsed.
Click to expand it.
dlls/wldap32/parse.c
+
1
−
1
View file @
b2c62c94
...
...
@@ -130,7 +130,7 @@ ULONG ldap_parse_referenceW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *message,
PWCHAR
**
referrals
)
{
ULONG
ret
=
LDAP_NOT_SUPPORTED
;
#ifdef HAVE_LDAP
#ifdef HAVE_LDAP
_PARSE_REFERENCE
char
**
referralsU
=
NULL
;
TRACE
(
"(%p, %p, %p)
\n
"
,
ld
,
message
,
referrals
);
...
...
This diff is collapsed.
Click to expand it.
include/config.h.in
+
12
−
0
View file @
b2c62c94
...
...
@@ -239,9 +239,21 @@
/* Define if you have the OpenLDAP development environment */
#undef HAVE_LDAP
/* Define to 1 if you have the `ldap_count_references' function. */
#undef HAVE_LDAP_COUNT_REFERENCES
/* Define to 1 if you have the `ldap_first_reference' function. */
#undef HAVE_LDAP_FIRST_REFERENCE
/* Define to 1 if you have the <ldap.h> header file. */
#undef HAVE_LDAP_H
/* Define to 1 if you have the `ldap_next_reference' function. */
#undef HAVE_LDAP_NEXT_REFERENCE
/* Define to 1 if you have the `ldap_parse_reference' function. */
#undef HAVE_LDAP_PARSE_REFERENCE
/* Define if you have libaudioIO */
#undef HAVE_LIBAUDIOIO
...
...
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