diff --git a/configure b/configure index 257dfeb662e..d9f9b653e90 100755 --- a/configure +++ b/configure @@ -754,7 +754,6 @@ GPHOTO2LIBS GPHOTO2INCL RESOLVLIBS LCMSLIBS -LDAPLIBS ft_devel FREETYPELIBS FREETYPEINCL @@ -774,6 +773,7 @@ MAIN_BINARY EXTRA_BINARIES LIBDL LIBPOLL +LDAPLIBS DEPENDENCIES LIBOBJS LTLIBOBJS' @@ -13737,270 +13737,6 @@ esac fi -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_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_r $LIBPTHREAD $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ldap_initialize (); -int -main () -{ -return ldap_initialize (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - 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_r_ldap_initialize=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ 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 $LIBPTHREAD $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ber_init (); -int -main () -{ -return ber_init (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_lber_ber_init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_lber_ber_init=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_init" >&5 -echo "${ECHO_T}$ac_cv_lib_lber_ber_init" >&6; } -if test $ac_cv_lib_lber_ber_init = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LDAP 1 -_ACEOF - - LDAPLIBS="-lldap_r -llber" -fi - -fi - - ac_wine_check_funcs_save_LIBS="$LIBS" -LIBS="$LIBS $LDAPLIBS $LIBPTHREAD" - - - - - - - - -for ac_func in \ - ldap_count_references \ - ldap_first_reference \ - ldap_next_reference \ - ldap_parse_reference \ - ldap_parse_sort_control \ - ldap_parse_sortresponse_control \ - ldap_parse_vlv_control \ - ldap_parse_vlvresponse_control -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 { as_var=$as_ac_var; eval "test \"\${$as_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 declares $ac_func. - For example, HP-UX 11i 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 to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -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 -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&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_wine_check_funcs_save_LIBS" -fi -if test "x$LDAPLIBS" = "x"; then - case "x$with_ldap" in - x) wine_notices="$wine_notices|libldap (OpenLDAP) development files not found, LDAP won't be supported." ;; - xno) ;; - *) { { echo "$as_me:$LINENO: error: libldap (OpenLDAP) development files not found, LDAP won't be supported. -This is an error since --with-ldap was requested." >&5 -echo "$as_me: error: libldap (OpenLDAP) development files not found, LDAP won't be supported. -This is an error since --with-ldap was requested." >&2;} - { (exit 1); exit 1; }; } ;; -esac -fi - - for ac_prog in freetype-config freetype2-config do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -17834,6 +17570,327 @@ fi done +LDAPLIBS="" + +if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes" +then + { echo "$as_me:$LINENO: checking for LDAPSortKey" >&5 +echo $ECHO_N "checking for LDAPSortKey... $ECHO_C" >&6; } +if test "${ac_cv_type_LDAPSortKey+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. */ +#include + +typedef LDAPSortKey ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_LDAPSortKey=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_LDAPSortKey=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_LDAPSortKey" >&5 +echo "${ECHO_T}$ac_cv_type_LDAPSortKey" >&6; } +if test $ac_cv_type_LDAPSortKey = yes; 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_r $LIBPTHREAD $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ldap_initialize (); +int +main () +{ +return ldap_initialize (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + 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_r_ldap_initialize=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ 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 $LIBPTHREAD $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ber_init (); +int +main () +{ +return ber_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_lber_ber_init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_lber_ber_init=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_init" >&5 +echo "${ECHO_T}$ac_cv_lib_lber_ber_init" >&6; } +if test $ac_cv_lib_lber_ber_init = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LDAP 1 +_ACEOF + + LDAPLIBS="-lldap_r -llber" +fi + +fi + +fi + + ac_wine_check_funcs_save_LIBS="$LIBS" +LIBS="$LIBS $LDAPLIBS $LIBPTHREAD" + + + + + + + + +for ac_func in \ + ldap_count_references \ + ldap_first_reference \ + ldap_next_reference \ + ldap_parse_reference \ + ldap_parse_sort_control \ + ldap_parse_sortresponse_control \ + ldap_parse_vlv_control \ + ldap_parse_vlvresponse_control +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 { as_var=$as_ac_var; eval "test \"\${$as_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 declares $ac_func. + For example, HP-UX 11i 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 to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +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 +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&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_wine_check_funcs_save_LIBS" +fi +if test "x$LDAPLIBS" = "x"; then + case "x$with_ldap" in + x) wine_notices="$wine_notices|libldap (OpenLDAP) development files not found, LDAP won't be supported." ;; + xno) ;; + *) { { echo "$as_me:$LINENO: error: libldap (OpenLDAP) development files not found, LDAP won't be supported. +This is an error since --with-ldap was requested." >&5 +echo "$as_me: error: libldap (OpenLDAP) development files not found, LDAP won't be supported. +This is an error since --with-ldap was requested." >&2;} + { (exit 1); exit 1; }; } ;; +esac +fi + + { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } @@ -23772,7 +23829,6 @@ GPHOTO2LIBS!$GPHOTO2LIBS$ac_delim GPHOTO2INCL!$GPHOTO2INCL$ac_delim RESOLVLIBS!$RESOLVLIBS$ac_delim LCMSLIBS!$LCMSLIBS$ac_delim -LDAPLIBS!$LDAPLIBS$ac_delim ft_devel!$ft_devel$ac_delim FREETYPELIBS!$FREETYPELIBS$ac_delim FREETYPEINCL!$FREETYPEINCL$ac_delim @@ -23792,6 +23848,7 @@ MAIN_BINARY!$MAIN_BINARY$ac_delim EXTRA_BINARIES!$EXTRA_BINARIES$ac_delim LIBDL!$LIBDL$ac_delim LIBPOLL!$LIBPOLL$ac_delim +LDAPLIBS!$LDAPLIBS$ac_delim DEPENDENCIES!$DEPENDENCIES$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim diff --git a/configure.ac b/configure.ac index fa925b101ef..400152f624c 100644 --- a/configure.ac +++ b/configure.ac @@ -977,30 +977,6 @@ fi WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"], [liblcms development files not found, Color Management won't be supported.]) -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_r, ldap_initialize, - [AC_CHECK_LIB(lber, ber_init, - [AC_DEFINE(HAVE_LDAP, 1, [Define if you have the OpenLDAP development environment]) - LDAPLIBS="-lldap_r -llber"],, - [$LIBPTHREAD])],, - [$LIBPTHREAD]) - WINE_CHECK_LIB_FUNCS(\ - ldap_count_references \ - ldap_first_reference \ - ldap_next_reference \ - ldap_parse_reference \ - ldap_parse_sort_control \ - ldap_parse_sortresponse_control \ - ldap_parse_vlv_control \ - ldap_parse_vlvresponse_control, - [$LDAPLIBS $LIBPTHREAD]) -fi -WINE_NOTICE_WITH(ldap,[test "x$LDAPLIBS" = "x"], - [libldap (OpenLDAP) development files not found, LDAP won't be supported.]) - dnl **** Check for FreeType 2 **** AC_CHECK_PROGS(ft_devel,[freetype-config freetype2-config],false) if test "$ft_devel" != "false" -a "x$with_freetype" != "xno" @@ -1461,6 +1437,32 @@ AC_CHECK_FUNCS(\ sendmsg \ ) +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_TYPE(LDAPSortKey, + [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_r -llber"],, + [$LIBPTHREAD])],, + [$LIBPTHREAD])],, + [#include ]) + WINE_CHECK_LIB_FUNCS(\ + ldap_count_references \ + ldap_first_reference \ + ldap_next_reference \ + ldap_parse_reference \ + ldap_parse_sort_control \ + ldap_parse_sortresponse_control \ + ldap_parse_vlv_control \ + ldap_parse_vlvresponse_control, + [$LDAPLIBS $LIBPTHREAD]) +fi +WINE_NOTICE_WITH(ldap,[test "x$LDAPLIBS" = "x"], + [libldap (OpenLDAP) development files not found, LDAP won't be supported.]) + dnl **** Check for types **** AC_C_CONST