Module: wine Branch: refs/heads/master Commit: b2c62c945550e5936574fb45ac2fd8eef7d2de7b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b2c62c945550e5936574fb45...
Author: Hans Leidekker hans@it.vu.nl Date: Wed Dec 21 18:42:00 2005 +0100
wldap32: Added configure checks for some potentially missing functions.
---
configure | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 8 ++++ dlls/wldap32/misc.c | 6 +-- dlls/wldap32/parse.c | 2 - include/config.h.in | 12 +++++ 5 files changed, 135 insertions(+), 4 deletions(-)
diff --git a/configure b/configure index fd7a1d0..b994c8b 100755 --- a/configure +++ b/configure @@ -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="" diff --git a/configure.ac b/configure.ac index e5c7311..b75844d 100644 --- a/configure.ac +++ b/configure.ac @@ -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 **** diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index 1f85cb6..dc47b5e 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -115,7 +115,7 @@ ULONG WLDAP32_ldap_count_entries( WLDAP3 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_
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_e
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 );
diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index a54dd52..89e9c14 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -130,7 +130,7 @@ ULONG ldap_parse_referenceW( WLDAP32_LDA 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 ); diff --git a/include/config.h.in b/include/config.h.in index 04718d1..d3eedd7 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -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