|
 |
1c8c13a |
--- evolution-data-server-1.11.5/acinclude.m4.fix-64bit-acinclude 2007-07-17 10:45:02.000000000 -0400
|
|
|
1c8c13a |
+++ evolution-data-server-1.11.5/acinclude.m4 2007-07-17 10:45:15.000000000 -0400
|
|
|
1c8c13a |
@@ -34,6 +34,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [
|
|
|
1c8c13a |
AC_ARG_WITH(openldap, [ --with-openldap=[no/yes/PREFIX] Enable LDAP support in evolution])
|
|
|
1c8c13a |
AC_ARG_WITH(static-ldap, [ --with-static-ldap=[no/yes] Link LDAP support statically into evolution ])
|
|
|
1c8c13a |
AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
|
|
|
1c8c13a |
+
|
|
|
1c8c13a |
+ AC_MSG_CHECKING(for multilib subdirectory)
|
|
|
1c8c13a |
+ if test "$GCC" = "yes" ; then
|
|
|
1c8c13a |
+ multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
|
|
|
1c8c13a |
+ fi
|
|
|
1c8c13a |
+ multilibsubdir=${multilibsubdir:-.}
|
|
|
1c8c13a |
+ AC_MSG_RESULT($multilibsubdir)
|
|
|
1c8c13a |
+ AC_MSG_CHECKING(for lib subdirectory)
|
|
|
1c8c13a |
+ libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([[^/]]*),\1,g'`
|
|
|
1c8c13a |
+ libsubdir=${libsubdir:-lib}
|
|
|
1c8c13a |
+ AC_MSG_RESULT($libsubdir)
|
|
|
1c8c13a |
+
|
|
|
1c8c13a |
case $ac_cv_with_openldap in
|
|
|
1c8c13a |
no|"")
|
|
|
1c8c13a |
with_openldap=no
|
|
|
1c8c13a |
@@ -44,7 +56,7 @@ AC_DEFUN([EVO_LDAP_CHECK], [
|
|
|
1c8c13a |
*)
|
|
|
1c8c13a |
with_openldap=$ac_cv_with_openldap
|
|
|
1c8c13a |
LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
|
|
|
1c8c13a |
- LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
|
|
|
1c8c13a |
+ LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
|
|
|
1c8c13a |
;;
|
|
|
1c8c13a |
esac
|
|
|
1c8c13a |
|
|
|
1c8c13a |
@@ -80,20 +92,20 @@ AC_DEFUN([EVO_LDAP_CHECK], [
|
|
|
1c8c13a |
AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
|
|
|
1c8c13a |
AC_CHECK_LIB(lber, ber_get_tag, [
|
|
|
1c8c13a |
if test "$with_static_ldap" = "yes"; then
|
|
|
1c8c13a |
- LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
|
|
|
1c8c13a |
+ LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
|
|
|
1c8c13a |
|
|
|
1c8c13a |
# libldap might depend on OpenSSL... We need to pull
|
|
|
1c8c13a |
# in the dependency libs explicitly here since we're
|
|
|
1c8c13a |
# not using libtool for the configure test.
|
|
|
1c8c13a |
- if test -f $with_openldap/lib/libldap.la; then
|
|
|
1c8c13a |
- LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
|
|
|
1c8c13a |
+ if test -f $with_openldap/$libsubdir/libldap.la; then
|
|
|
1c8c13a |
+ LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
|
|
|
1c8c13a |
fi
|
|
|
1c8c13a |
else
|
|
|
1c8c13a |
LDAP_LIBS="-llber $LDAP_LIBS"
|
|
|
1c8c13a |
fi
|
|
|
1c8c13a |
AC_CHECK_LIB(ldap, ldap_open, [
|
|
|
1c8c13a |
if test $with_static_ldap = "yes"; then
|
|
|
1c8c13a |
- LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
|
|
|
1c8c13a |
+ LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
|
|
|
1c8c13a |
else
|
|
|
1c8c13a |
LDAP_LIBS="-lldap $LDAP_LIBS"
|
|
|
1c8c13a |
fi],
|