diff options
| author | Rodney Dawes <dobey@novell.com> | 2004-08-14 02:16:20 +0800 |
|---|---|---|
| committer | Rodney Dawes <dobey@src.gnome.org> | 2004-08-14 02:16:20 +0800 |
| commit | e9fbd043e5538a341e5ffd33ec00a666b0f6c415 (patch) | |
| tree | 62282432421dc13b22f4e981fda835fbeab64f0a | |
| parent | b851882164e75ce857f590e92f0dec0c03771311 (diff) | |
| download | gsoc2013-evolution-e9fbd043e5538a341e5ffd33ec00a666b0f6c415.tar gsoc2013-evolution-e9fbd043e5538a341e5ffd33ec00a666b0f6c415.tar.gz gsoc2013-evolution-e9fbd043e5538a341e5ffd33ec00a666b0f6c415.tar.bz2 gsoc2013-evolution-e9fbd043e5538a341e5ffd33ec00a666b0f6c415.tar.lz gsoc2013-evolution-e9fbd043e5538a341e5ffd33ec00a666b0f6c415.tar.xz gsoc2013-evolution-e9fbd043e5538a341e5ffd33ec00a666b0f6c415.tar.zst gsoc2013-evolution-e9fbd043e5538a341e5ffd33ec00a666b0f6c415.zip | |
Revert previous EVO_LDAP_CHECK changes, aren't working as well as expceted
2004-08-13 Rodney Dawes <dobey@novell.com>
* acinclude.m4: Revert previous EVO_LDAP_CHECK changes, aren't working
as well as expceted and determined in testing
svn path=/trunk/; revision=26924
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | acinclude.m4 | 29 |
2 files changed, 24 insertions, 10 deletions
@@ -1,3 +1,8 @@ +2004-08-13 Rodney Dawes <dobey@novell.com> + + * acinclude.m4: Revert previous EVO_LDAP_CHECK changes, aren't working + as well as expceted and determined in testing + 2004-08-13 Frederic Crozat <fcrozat@mandrakesoft.com> * configure.in: diff --git a/acinclude.m4 b/acinclude.m4 index 72f77d3d33..d3f83734d4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -31,13 +31,22 @@ AC_DEFUN([EVO_PURIFY_SUPPORT], [ AC_DEFUN([EVO_LDAP_CHECK], [ default="$1" - AC_ARG_WITH(openldap, [ --with-openldap=[no/yes/PREFIX] Enable LDAP support in evolution], with_openldap="$withval", with_openldap="/usr") - AC_ARG_WITH(openldap-libs,[ --with-openldap-libs=DIR Location of openldap libraries to link with], with_openldap_libs="$withval", with_openldap_libs="$with_openldap/lib") - AC_ARG_WITH(openldap-includes,[ --with-openldap-includes=DIR Location of openldap libraries to link with], with_openldap_includes="$withval", with_openldap_includes="$with_openldap/include") + AC_ARG_WITH(openldap, [ --with-openldap=[no/yes/PREFIX] Enable LDAP support in evolution]) AC_ARG_WITH(static-ldap, [ --with-static-ldap=[no/yes] Link LDAP support statically into evolution ]) - - LDAP_CFLAGS="-I$with_openldap_includes" - LDAP_LDFLAGS="-L$with_openldap_libs" + AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}") + case $ac_cv_with_openldap in + no|"") + with_openldap=no + ;; + yes) + with_openldap=/usr + ;; + *) + with_openldap=$ac_cv_with_openldap + LDAP_CFLAGS="-I$ac_cv_with_openldap/include" + LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib" + ;; + esac if test "$with_openldap" != no; then AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) @@ -71,20 +80,20 @@ AC_DEFUN([EVO_LDAP_CHECK], [ AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl") AC_CHECK_LIB(lber, ber_get_tag, [ if test "$with_static_ldap" = "yes"; then - LDAP_LIBS="$with_openldap_libs/liblber.a $LDAP_LIBS" + LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS" # libldap might depend on OpenSSL... We need to pull # in the dependency libs explicitly here since we're # not using libtool for the configure test. - if test -f $with_openldap_libs/libldap.la; then - LDAP_LIBS="`. $with_openldap_libs/libldap.la; echo $dependency_libs` $LDAP_LIBS" + if test -f $with_openldap/lib/libldap.la; then + LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS" fi else LDAP_LIBS="-llber $LDAP_LIBS" fi AC_CHECK_LIB(ldap, ldap_open, [ if test $with_static_ldap = "yes"; then - LDAP_LIBS="$with_openldap_libs/libldap.a $LDAP_LIBS" + LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS" else LDAP_LIBS="-lldap $LDAP_LIBS" fi], |