You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bo...@apache.org on 2008/07/09 00:30:54 UTC
svn commit: r675007 - /apr/apr-util/trunk/build/apu-conf.m4
Author: bojan
Date: Tue Jul 8 15:30:53 2008
New Revision: 675007
URL: http://svn.apache.org/viewvc?rev=675007&view=rev
Log:
Fix build with LDAP on FreeBSD.
Patch by Philip M. Gollucci <pgollucci p6m7g8.com>
Modified:
apr/apr-util/trunk/build/apu-conf.m4
Modified: apr/apr-util/trunk/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/apu-conf.m4?rev=675007&r1=675006&r2=675007&view=diff
==============================================================================
--- apr/apr-util/trunk/build/apu-conf.m4 (original)
+++ apr/apr-util/trunk/build/apu-conf.m4 Tue Jul 8 15:30:53 2008
@@ -357,6 +357,12 @@
])
if test "$apu_has_ldap_openldap" = "1"; then
+ save_cppflags="$CPPFLAGS"
+ save_ldflags="$LDFLAGS"
+ save_libs="$LIBS"
+
+ 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)