diff options
Diffstat (limited to 'mail/dbmail/files/extra-patch-acinclude.m4')
| -rw-r--r-- | mail/dbmail/files/extra-patch-acinclude.m4 | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/mail/dbmail/files/extra-patch-acinclude.m4 b/mail/dbmail/files/extra-patch-acinclude.m4 index f0eb87c767d7..fcec2a2bccca 100644 --- a/mail/dbmail/files/extra-patch-acinclude.m4 +++ b/mail/dbmail/files/extra-patch-acinclude.m4 @@ -1,6 +1,6 @@ ---- acinclude.m4.orig 2012-05-30 16:42:44.000000000 +0100 -+++ acinclude.m4 2012-05-30 16:44:28.000000000 +0100 -@@ -235,7 +235,7 @@ +--- 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 @@ -9,7 +9,7 @@ if test [ "x$LDAPLIB" != "xfailed" ]; then break fi -@@ -247,7 +247,7 @@ +@@ -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" @@ -18,3 +18,12 @@ 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" |