You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@apr.apache.org by mi...@apache.org on 2004/12/17 17:11:47 UTC

svn commit: r122649 - /apr/apr-util/branches/0.9.x/CHANGES /apr/apr-util/branches/0.9.x/build/apu-conf.m4

Author: minfrin
Date: Fri Dec 17 08:11:46 2004
New Revision: 122649

URL: http://svn.apache.org/viewcvs?view=rev&rev=122649
Log:
Fix the detection of ldap.h on Solaris - it needs lber.h to be defined first.

Modified:
   apr/apr-util/branches/0.9.x/CHANGES
   apr/apr-util/branches/0.9.x/build/apu-conf.m4

Modified: apr/apr-util/branches/0.9.x/CHANGES
Url: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/CHANGES?view=diff&rev=122649&p1=apr/apr-util/branches/0.9.x/CHANGES&r1=122648&p2=apr/apr-util/branches/0.9.x/CHANGES&r2=122649
==============================================================================
--- apr/apr-util/branches/0.9.x/CHANGES	(original)
+++ apr/apr-util/branches/0.9.x/CHANGES	Fri Dec 17 08:11:46 2004
@@ -1,5 +1,8 @@
 Changes with APR-util 0.9.6
 
+  *) Fix the detection of ldap.h on Solaris - it needs lber.h to be
+     defined first. [Graham Leggett]
+
   *) Add an RPM spec file. [Graham Leggett]
 
   *) Add a build script to create a solaris package. [Graham Leggett]

Modified: apr/apr-util/branches/0.9.x/build/apu-conf.m4
Url: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/build/apu-conf.m4?view=diff&rev=122649&p1=apr/apr-util/branches/0.9.x/build/apu-conf.m4&r1=122648&p2=apr/apr-util/branches/0.9.x/build/apu-conf.m4&r2=122649
==============================================================================
--- apr/apr-util/branches/0.9.x/build/apu-conf.m4	(original)
+++ apr/apr-util/branches/0.9.x/build/apu-conf.m4	Fri Dec 17 08:11:46 2004
@@ -279,8 +279,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