On 07/08/2008 07:55 PM, Philip M. Gollucci wrote:
Resending from an address that will make it through to lists.
Philip M. Gollucci wrote:
Hi All,
as you can see the recent update of devel/apr from 1.2.12 to 1.3.2
breaks apr-util when building with LDAP on FreeBSD. The log is from a
FreeBSD tinderbox, but can reproduced with the normal build steps.
The attached patch fixes it both in and out of tinderbox.
This particular diff is against branches/1.3.x but build/apu-conf.m4
is identical on trunk so it should apply there too.
I'll submit a FreeBSD PR to fix the port so it doesn't have to wait
for 1.3.3 next.
Index: build/apu-conf.m4
===================================================================
--- build/apu-conf.m4 (revision 674869)
+++ build/apu-conf.m4 (working copy)
@@ -357,6 +357,12 @@
])
if test "$apu_has_ldap_openldap" = "1"; then
+ CPPFLAGS=$save_cppflags
+ LDFLAGS=$save_ldflags
+ LIBS=$save_libs
Shouldn't this be the other way round such that you *safe* the old values
of CPPFLAGS, LDFLAGS and LIBS for later restore in the safe* variables?
+
+ CPPFLAGS="$CPPFLAGS $APRUTIL_INCLUDES"
+ LDFLAGS="$LDFLAGS $APRUTIL_LDFLAGS"
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
@@ -374,6 +380,10 @@
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)
Regards
Rüdiger
