apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1128885 - in /apr/apr/trunk: build/apu-conf.m4 build/apu-ldap.m4 configure.in
Date Sun, 29 May 2011 14:59:31 GMT
Author: wrowe
Date: Sun May 29 14:59:30 2011
New Revision: 1128885

URL: http://svn.apache.org/viewvc?rev=1128885&view=rev
Log:
Begin refactoring to prepare for ldap removal

Added:
    apr/apr/trunk/build/apu-ldap.m4   (with props)
Modified:
    apr/apr/trunk/build/apu-conf.m4
    apr/apr/trunk/configure.in

Modified: apr/apr/trunk/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apu-conf.m4?rev=1128885&r1=1128884&r2=1128885&view=diff
==============================================================================
--- apr/apr/trunk/build/apu-conf.m4 (original)
+++ apr/apr/trunk/build/apu-conf.m4 Sun May 29 14:59:30 2011
@@ -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

Added: apr/apr/trunk/build/apu-ldap.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apu-ldap.m4?rev=1128885&view=auto
==============================================================================
--- apr/apr/trunk/build/apu-ldap.m4 (added)
+++ apr/apr/trunk/build/apu-ldap.m4 Sun May 29 14:59:30 2011
@@ -0,0 +1,266 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements.  See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License.  You may obtain a copy of the License at
+dnl
+dnl     http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
+
+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)
+
+])
+
+

Propchange: apr/apr/trunk/build/apu-ldap.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=1128885&r1=1128884&r2=1128885&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Sun May 29 14:59:30 2011
@@ -27,6 +27,7 @@ sinclude(build/ltversion.m4)
 sinclude(build/lt~obsolete.m4)
 
 sinclude(build/apu-conf.m4)
+sinclude(build/apu-ldap.m4)
 sinclude(build/xml.m4)
 sinclude(build/apu-hints.m4)
 sinclude(build/crypto.m4)



Mime
View raw message