diff options
Diffstat (limited to 'mail/dbmail/files/patch-acinclude.m4')
| -rw-r--r-- | mail/dbmail/files/patch-acinclude.m4 | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/mail/dbmail/files/patch-acinclude.m4 b/mail/dbmail/files/patch-acinclude.m4 new file mode 100644 index 000000000000..fcec2a2bccca --- /dev/null +++ b/mail/dbmail/files/patch-acinclude.m4 @@ -0,0 +1,29 @@ +--- acinclude.m4.orig ++++ acinclude.m4 +@@ -236,7 +236,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ] + dnl See if we already have the paths we need in the environment. + dnl ...but only if --with-ldap was given without a specific path. + if ( test [ "x$lookforldap" = "xyes" ] || test [ "x$lookforauthldap" = "xyes" ] ); then +- AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap"], [LDAPLIB="failed"]) ++ AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap_r"], [LDAPLIB="failed"]) + if test [ "x$LDAPLIB" != "xfailed" ]; then + break + fi +@@ -248,7 +248,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ] + SAVE_CFLAGS=$CFLAGS + dnl The headers might be in a funny place, so we need to use -Ipath + CFLAGS="$CFLAGS -L$TEST_PATH $LDAPINC" +- AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap"], [LDAPLIB="failed"]) ++ AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap_r"], [LDAPLIB="failed"]) + CFLAGS=$SAVE_CFLAGS + if test [ "x$LDAPLIB" != "xfailed" ]; then + break 2 +@@ -262,7 +262,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ] + AC_MSG_ERROR([Could not find LDAP library.]) + else + AC_DEFINE([AUTHLDAP], 1, [Define if LDAP will be used.]) +- AC_SEARCH_LIBS(ldap_initialize, ldap, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()])) ++ AC_SEARCH_LIBS(ldap_initialize, ldap_r, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()])) + AC_SUBST(LDAPLIB) + AC_SUBST(LDAPINC) + AUTHALIB="modules/.libs/libauth_ldap.a" |