|
 |
9cfe9a |
diff -up evolution-data-server-2.27.91/m4/evo_ldap_check.m4.fix-64bit-acinclude evolution-data-server-2.27.91/m4/evo_ldap_check.m4
|
|
|
9cfe9a |
--- evolution-data-server-2.27.91/m4/evo_ldap_check.m4.fix-64bit-acinclude 2009-08-24 12:45:52.000000000 +0200
|
|
|
9cfe9a |
+++ evolution-data-server-2.27.91/m4/evo_ldap_check.m4 2009-08-24 12:48:08.000000000 +0200
|
|
|
9cfe9a |
@@ -14,6 +14,18 @@ AC_DEFUN([EVO_LDAP_CHECK],[
|
|
|
9cfe9a |
[AS_HELP_STRING([--with-static-ldap],
|
|
|
9cfe9a |
[Link LDAP support statically into evolution])])
|
|
|
9cfe9a |
AC_CACHE_CHECK([for OpenLDAP], [ac_cv_with_openldap], [ac_cv_with_openldap="${with_openldap:=$default}"])
|
|
|
9cfe9a |
+
|
|
|
9cfe9a |
+ AC_MSG_CHECKING(for multilib subdirectory)
|
|
|
9cfe9a |
+ if test "$GCC" = "yes" ; then
|
|
|
9cfe9a |
+ multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
|
|
|
9cfe9a |
+ fi
|
|
|
9cfe9a |
+ multilibsubdir=${multilibsubdir:-.}
|
|
|
9cfe9a |
+ AC_MSG_RESULT($multilibsubdir)
|
|
|
9cfe9a |
+ AC_MSG_CHECKING(for lib subdirectory)
|
|
|
9cfe9a |
+ libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([[^/]]*),\1,g'`
|
|
|
9cfe9a |
+ libsubdir=${libsubdir:-lib}
|
|
|
9cfe9a |
+ AC_MSG_RESULT($libsubdir)
|
|
|
9cfe9a |
+
|
|
|
9cfe9a |
case $ac_cv_with_openldap in
|
|
|
9cfe9a |
no|"")
|
|
|
9cfe9a |
with_openldap=no
|
|
|
9cfe9a |
@@ -24,7 +36,7 @@ AC_DEFUN([EVO_LDAP_CHECK],[
|
|
|
9cfe9a |
*)
|
|
|
9cfe9a |
with_openldap=$ac_cv_with_openldap
|
|
|
9cfe9a |
LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
|
|
|
9cfe9a |
- LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
|
|
|
9cfe9a |
+ LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
|
|
|
9cfe9a |
;;
|
|
|
9cfe9a |
esac
|
|
|
9cfe9a |
|
|
|
9cfe9a |
@@ -60,20 +72,20 @@ AC_DEFUN([EVO_LDAP_CHECK],[
|
|
|
9cfe9a |
AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
|
|
|
9cfe9a |
AC_CHECK_LIB(lber, ber_get_tag, [
|
|
|
9cfe9a |
if test "$with_static_ldap" = "yes"; then
|
|
|
9cfe9a |
- LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
|
|
|
9cfe9a |
+ LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
|
|
|
9cfe9a |
|
|
|
9cfe9a |
# libldap might depend on OpenSSL... We need to pull
|
|
|
9cfe9a |
# in the dependency libs explicitly here since we're
|
|
|
9cfe9a |
# not using libtool for the configure test.
|
|
|
9cfe9a |
- if test -f $with_openldap/lib/libldap.la; then
|
|
|
9cfe9a |
- LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
|
|
|
9cfe9a |
+ if test -f $with_openldap/$libsubdir/libldap.la; then
|
|
|
9cfe9a |
+ LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
|
|
|
9cfe9a |
fi
|
|
|
9cfe9a |
else
|
|
|
9cfe9a |
LDAP_LIBS="-llber $LDAP_LIBS"
|
|
|
9cfe9a |
fi
|
|
|
9cfe9a |
AC_CHECK_LIB(ldap, ldap_open, [
|
|
|
9cfe9a |
if test $with_static_ldap = "yes"; then
|
|
|
9cfe9a |
- LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
|
|
|
9cfe9a |
+ LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
|
|
|
9cfe9a |
else
|
|
|
9cfe9a |
LDAP_LIBS="-lldap $LDAP_LIBS"
|
|
|
9cfe9a |
fi],
|