Return-Path: Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Delivered-To: mailing list commits@apr.apache.org Received: (qmail 78361 invoked by uid 99); 21 Dec 2004 11:03:55 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 21 Dec 2004 03:03:46 -0800 Received: (qmail 85178 invoked by uid 65534); 21 Dec 2004 11:03:40 -0000 Date: 21 Dec 2004 11:03:40 -0000 Message-ID: <20041221110340.85176.qmail@minotaur.apache.org> From: minfrin@apache.org To: commits@apr.apache.org Subject: svn commit: r122963 - /apr/apr-util/branches/1.0.x/build/apu-conf.m4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked Author: minfrin Date: Tue Dec 21 03:03:38 2004 New Revision: 122963 URL: http://svn.apache.org/viewcvs?view=rev&rev=122963 Log: Fix the detection of ldap.h so that it works again on autoconf v2.13 Modified: apr/apr-util/branches/1.0.x/build/apu-conf.m4 Modified: apr/apr-util/branches/1.0.x/build/apu-conf.m4 Url: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.0.x/build/apu-conf.m4?view=diff&rev=122963&p1=apr/apr-util/branches/1.0.x/build/apu-conf.m4&r1=122962&p2=apr/apr-util/branches/1.0.x/build/apu-conf.m4&r2=122963 ============================================================================== --- apr/apr-util/branches/1.0.x/build/apu-conf.m4 (original) +++ apr/apr-util/branches/1.0.x/build/apu-conf.m4 Tue Dec 21 03:03:38 2004 @@ -286,11 +286,22 @@ AC_CHECK_LIB(lber, ber_init) AC_CHECK_HEADERS(lber.h, lber_h=["#include "]) - AC_CHECK_HEADERS(ldap.h, ldap_h=["#include "], [], -[#if HAVE_LBER_H -# include -# endif -]) + + # Solaris has a problem in which prevents it from + # being included by itself. Check for manually, + # including lber.h first. + AC_CACHE_CHECK([for ldap.h], [apr_cv_hdr_ldap_h], + [AC_TRY_CPP( + [#ifdef HAVE_LBER_H + #include + #endif + #include + ], [apr_cv_hdr_ldap_h=yes], [apr_cv_hdr_ldap_h=no])]) + if test "$apr_cv_hdr_ldap_h" = "yes"; then + ldap_h=["#include "] + AC_DEFINE([HAVE_LDAP_H], 1, [Defined if ldap.h is present]) + fi + AC_CHECK_HEADERS(ldap_ssl.h, ldap_ssl_h=["#include "]) CPPFLAGS=$save_cppflags