Author: minfrin Date: Fri Dec 17 08:09:21 2004 New Revision: 122647 URL: http://svn.apache.org/viewcvs?view=rev&rev=122647 Log: Fix the detection of ldap.h on Solaris - it needs lber.h to be defined first.
Modified: apr/apr-util/trunk/CHANGES apr/apr-util/trunk/build/apu-conf.m4 Modified: apr/apr-util/trunk/CHANGES Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/CHANGES?view=diff&rev=122647&p1=apr/apr-util/trunk/CHANGES&r1=122646&p2=apr/apr-util/trunk/CHANGES&r2=122647 ============================================================================== --- apr/apr-util/trunk/CHANGES (original) +++ apr/apr-util/trunk/CHANGES Fri Dec 17 08:09:21 2004 @@ -1,5 +1,8 @@ Changes with APR-util 1.1.0 + *) Fix the detection of ldap.h on Solaris - it needs lber.h to be + defined first. [Graham Leggett] + *) Add a build script to create a solaris package. [Graham Leggett] *) Added the apr_ldap_ssl_add_cert() API to allow multiple certificates Modified: apr/apr-util/trunk/build/apu-conf.m4 Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/build/apu-conf.m4?view=diff&rev=122647&p1=apr/apr-util/trunk/build/apu-conf.m4&r1=122646&p2=apr/apr-util/trunk/build/apu-conf.m4&r2=122647 ============================================================================== --- apr/apr-util/trunk/build/apu-conf.m4 (original) +++ apr/apr-util/trunk/build/apu-conf.m4 Fri Dec 17 08:09:21 2004 @@ -275,8 +275,12 @@ test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library) AC_CHECK_LIB(lber, ber_init) - AC_CHECK_HEADERS(ldap.h, ldap_h=["#include <ldap.h>"]) AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"]) + AC_CHECK_HEADERS(ldap.h, ldap_h=["#include <ldap.h>"], [], +[#if HAVE_LBER_H +# include <lber.h> +# endif +]) AC_CHECK_HEADERS(ldap_ssl.h, ldap_ssl_h=["#include <ldap_ssl.h>"]) CPPFLAGS=$save_cppflags
