diff options
author | William A. Rowe Jr <wrowe@apache.org> | 2011-05-29 14:59:30 +0000 |
---|---|---|
committer | William A. Rowe Jr <wrowe@apache.org> | 2011-05-29 14:59:30 +0000 |
commit | 1d3e4867aea8c171389a330ffba37a65c46105ae (patch) | |
tree | 08b2c13af7bb7f7fa5c25c886ad138438cdffb3c /build/apu-conf.m4 | |
parent | eab9aaf3cabc11169cdb83ad1d84a100f308bcf6 (diff) | |
download | apr-1d3e4867aea8c171389a330ffba37a65c46105ae.tar.gz |
Begin refactoring to prepare for ldap removal
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1128885 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/apu-conf.m4')
-rw-r--r-- | build/apu-conf.m4 | 248 |
1 files changed, 0 insertions, 248 deletions
diff --git a/build/apu-conf.m4 b/build/apu-conf.m4 index 0133b74ba..61f27d83b 100644 --- a/build/apu-conf.m4 +++ b/build/apu-conf.m4 @@ -47,254 +47,6 @@ AC_DEFUN([APU_FIND_APR], [ ]) -dnl -dnl Find a particular LDAP library -dnl -AC_DEFUN([APU_FIND_LDAPLIB], [ - if test ${apu_has_ldap} != "1"; then - ldaplib=$1 - extralib=$2 - # Clear the cache entry for subsequent APU_FIND_LDAPLIB invocations. - changequote(,) - ldaplib_cache_id="`echo $ldaplib | sed -e 's/[^a-zA-Z0-9_]/_/g'`" - changequote([,]) - unset ac_cv_lib_${ldaplib_cache_id}_ldap_init - unset ac_cv_lib_${ldaplib_cache_id}___ldap_init - AC_CHECK_LIB(${ldaplib}, ldap_init, - [ - LDADD_ldap="-l${ldaplib} ${extralib}" - AC_CHECK_LIB(${ldaplib}, ldapssl_client_init, apu_has_ldapssl_client_init="1", , ${extralib}) - AC_CHECK_LIB(${ldaplib}, ldapssl_client_deinit, apu_has_ldapssl_client_deinit="1", , ${extralib}) - AC_CHECK_LIB(${ldaplib}, ldapssl_add_trusted_cert, apu_has_ldapssl_add_trusted_cert="1", , ${extralib}) - AC_CHECK_LIB(${ldaplib}, ldap_start_tls_s, apu_has_ldap_start_tls_s="1", , ${extralib}) - AC_CHECK_LIB(${ldaplib}, ldap_sslinit, apu_has_ldap_sslinit="1", , ${extralib}) - AC_CHECK_LIB(${ldaplib}, ldapssl_init, apu_has_ldapssl_init="1", , ${extralib}) - AC_CHECK_LIB(${ldaplib}, ldapssl_install_routines, apu_has_ldapssl_install_routines="1", , ${extralib}) - apu_has_ldap="1"; - ], , ${extralib}) - fi -]) - - -dnl -dnl APU_FIND_LDAP: figure out where LDAP is located -dnl -AC_DEFUN([APU_FIND_LDAP], [ - -echo $ac_n "${nl}checking for ldap support..." - -apu_has_ldap="0"; -apu_has_ldapssl_client_init="0" -apu_has_ldapssl_client_deinit="0" -apu_has_ldapssl_add_trusted_cert="0" -apu_has_ldap_start_tls_s="0" -apu_has_ldapssl_init="0" -apu_has_ldap_sslinit="0" -apu_has_ldapssl_install_routines="0" -apu_has_ldap_openldap="0" -apu_has_ldap_solaris="0" -apu_has_ldap_novell="0" -apu_has_ldap_microsoft="0" -apu_has_ldap_netscape="0" -apu_has_ldap_mozilla="0" -apu_has_ldap_tivoli="0" -apu_has_ldap_zos="0" -apu_has_ldap_other="0" -LDADD_ldap="" - -AC_ARG_WITH(lber,[ --with-lber=library lber library to use], - [ - if test "$withval" = "yes"; then - apu_liblber_name="lber" - else - apu_liblber_name="$withval" - fi - ], - [ - apu_liblber_name="lber" - ]) - -AC_ARG_WITH(ldap-include,[ --with-ldap-include=path path to ldap include files with trailing slash]) -AC_ARG_WITH(ldap-lib,[ --with-ldap-lib=path path to ldap lib file]) -AC_ARG_WITH(ldap,[ --with-ldap=library ldap library to use], - [ - if test "$with_ldap" != "no"; then - save_cppflags="$CPPFLAGS" - save_ldflags="$LDFLAGS" - save_libs="$LIBS" - if test -n "$with_ldap_include"; then - CPPFLAGS="$CPPFLAGS -I$with_ldap_include" - APR_ADDTO(INCLUDES, [-I$with_ldap_include]) - fi - if test -n "$with_ldap_lib"; then - APR_ADDTO(LDFLAGS, [-L$with_ldap_lib]) - fi - - LIBLDAP="$withval" - if test "$LIBLDAP" = "yes"; then - dnl The iPlanet C SDK 5.0 is as yet untested... - APU_FIND_LDAPLIB("ldap50", "-lnspr4 -lplc4 -lplds4 -liutil50 -llber50 -lldif50 -lnss3 -lprldap50 -lssl3 -lssldap50") - APU_FIND_LDAPLIB("ldapssl41", "-lnspr3 -lplc3 -lplds3") - APU_FIND_LDAPLIB("ldapssl40") - APU_FIND_LDAPLIB("ldapssl30") - APU_FIND_LDAPLIB("ldapssl20") - APU_FIND_LDAPLIB("ldapsdk", "-lldapx -lldapssl -lldapgss -lgssapi_krb5") - APU_FIND_LDAPLIB("ldapsdk", "-lldapx -lldapssl -lldapgss -lgss -lresolv -lsocket") - APU_FIND_LDAPLIB("ldap", "-llber") - APU_FIND_LDAPLIB("ldap", "-llber -lresolv") - APU_FIND_LDAPLIB("ldap", "-llber -lresolv -lsocket -lnsl") - APU_FIND_LDAPLIB("ldap", "-ldl -lpthread") - else - APU_FIND_LDAPLIB($LIBLDAP) - APU_FIND_LDAPLIB($LIBLDAP, "-lresolv") - APU_FIND_LDAPLIB($LIBLDAP, "-lresolv -lsocket -lnsl") - APU_FIND_LDAPLIB($LIBLDAP, "-ldl -lpthread") - fi - - test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library) - AC_CHECK_LIB($apu_liblber_name, ber_init, - [LDADD_ldap="${LDADD_ldap} -l${apu_liblber_name}"]) - - AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"]) - - # Solaris has a problem in <ldap.h> which prevents it from - # being included by itself. Check for <ldap.h> manually, - # including lber.h first. - AC_CACHE_CHECK([for ldap.h], [apr_cv_hdr_ldap_h], - [AC_TRY_CPP( - [#ifdef HAVE_LBER_H - #include <lber.h> - #endif - #include <ldap.h> - ], [apr_cv_hdr_ldap_h=yes], [apr_cv_hdr_ldap_h=no])]) - if test "$apr_cv_hdr_ldap_h" = "yes"; then - ldap_h=["#include <ldap.h>"] - AC_DEFINE([HAVE_LDAP_H], 1, [Defined if ldap.h is present]) - fi - - AC_CHECK_HEADERS(ldap_ssl.h, ldap_ssl_h=["#include <ldap_ssl.h>"]) - - if test "$apr_cv_hdr_ldap_h" = "yes"; then - AC_CACHE_CHECK([for LDAP toolkit], - [apr_cv_ldap_toolkit], [ - if test "x$apr_cv_ldap_toolkit" = "x"; then - AC_EGREP_CPP([OpenLDAP], [$lber_h - $ldap_h - LDAP_VENDOR_NAME], [apu_has_ldap_openldap="1" - apr_cv_ldap_toolkit="OpenLDAP"]) - fi - if test "x$apr_cv_ldap_toolkit" = "x"; then - AC_EGREP_CPP([Sun Microsystems Inc.], [$lber_h - $ldap_h - LDAP_VENDOR_NAME], [apu_has_ldap_solaris="1" - apr_cv_ldap_toolkit="Solaris"]) - fi - if test "x$apr_cv_ldap_toolkit" = "x"; then - AC_EGREP_CPP([Novell], [$lber_h - $ldap_h - LDAP_VENDOR_NAME], [apu_has_ldap_novell="1" - apr_cv_ldap_toolkit="Novell"]) - fi - if test "x$apr_cv_ldap_toolkit" = "x"; then - AC_EGREP_CPP([Microsoft Corporation.], [$lber_h - $ldap_h - LDAP_VENDOR_NAME], [apu_has_ldap_microsoft="1" - apr_cv_ldap_toolkit="Microsoft"]) - fi - if test "x$apr_cv_ldap_toolkit" = "x"; then - AC_EGREP_CPP([Netscape Communications Corp.], [$lber_h - $ldap_h - LDAP_VENDOR_NAME], [apu_has_ldap_netscape="1" - apr_cv_ldap_toolkit="Netscape"]) - fi - if test "x$apr_cv_ldap_toolkit" = "x"; then - AC_EGREP_CPP([mozilla.org], [$lber_h - $ldap_h - LDAP_VENDOR_NAME], [apu_has_ldap_mozilla="1" - apr_cv_ldap_toolkit="Mozilla"]) - fi - if test "x$apr_cv_ldap_toolkit" = "x"; then - AC_EGREP_CPP([International Business Machines], [$lber_h - $ldap_h - LDAP_VENDOR_NAME], [apu_has_ldap_tivoli="1" - apr_cv_ldap_toolkit="Tivoli"]) - fi - if test "x$apr_cv_ldap_toolkit" = "x"; then - case "$host" in - *-ibm-os390) - AC_EGREP_CPP([IBM], [$lber_h - $ldap_h], [apu_has_ldap_zos="1" - apr_cv_ldap_toolkit="z/OS"]) - ;; - esac - fi - if test "x$apr_cv_ldap_toolkit" = "x"; then - apu_has_ldap_other="1" - apr_cv_ldap_toolkit="unknown" - fi - ]) - fi - - CPPFLAGS=$save_cppflags - LDFLAGS=$save_ldflags - LIBS=$save_libs - fi - ]) - -if test "$apu_has_ldap_openldap" = "1"; then - save_cppflags="$CPPFLAGS" - save_ldflags="$LDFLAGS" - save_libs="$LIBS" - - CPPFLAGS="$CPPFLAGS $INCLUDES" - AC_CACHE_CHECK([style of ldap_set_rebind_proc routine], ac_cv_ldap_set_rebind_proc_style, - APR_TRY_COMPILE_NO_WARNING([ - #ifdef HAVE_LBER_H - #include <lber.h> - #endif - #ifdef HAVE_LDAP_H - #include <ldap.h> - #endif - ], [ - int tmp = ldap_set_rebind_proc((LDAP *)0, (LDAP_REBIND_PROC *)0, (void *)0); - /* use tmp to suppress the warning */ - tmp=0; - ], ac_cv_ldap_set_rebind_proc_style=three, ac_cv_ldap_set_rebind_proc_style=two)) - - if test "$ac_cv_ldap_set_rebind_proc_style" = "three"; then - AC_DEFINE(LDAP_SET_REBIND_PROC_THREE, 1, [Define if ldap_set_rebind_proc takes three arguments]) - fi - - CPPFLAGS="$save_cppflags" - LDFLAGS="$save_ldflags" - LIBS="$save_libs" -fi - -AC_SUBST(ldap_h) -AC_SUBST(lber_h) -AC_SUBST(ldap_ssl_h) -AC_SUBST(apu_has_ldapssl_client_init) -AC_SUBST(apu_has_ldapssl_client_deinit) -AC_SUBST(apu_has_ldapssl_add_trusted_cert) -AC_SUBST(apu_has_ldap_start_tls_s) -AC_SUBST(apu_has_ldapssl_init) -AC_SUBST(apu_has_ldap_sslinit) -AC_SUBST(apu_has_ldapssl_install_routines) -AC_SUBST(apu_has_ldap) -AC_SUBST(apu_has_ldap_openldap) -AC_SUBST(apu_has_ldap_solaris) -AC_SUBST(apu_has_ldap_novell) -AC_SUBST(apu_has_ldap_microsoft) -AC_SUBST(apu_has_ldap_netscape) -AC_SUBST(apu_has_ldap_mozilla) -AC_SUBST(apu_has_ldap_tivoli) -AC_SUBST(apu_has_ldap_zos) -AC_SUBST(apu_has_ldap_other) -AC_SUBST(LDADD_ldap) -AC_SUBST(APRUTIL_EXPORT_LIBS) - -]) - dnl dnl APU_CHECK_CRYPT_R_STYLE dnl |