diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 7beb9f6b46..6a677a8828 100644 --- a/configure.in +++ b/configure.in @@ -12,6 +12,8 @@ PACKAGE=evolution AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AC_SUBST(VERSION) +AC_CANONICAL_HOST + AC_DEFINE_UNQUOTED(VERSION_COMMENT, "(Preview Release)") AC_DEFUN(EVO_CHECK_LIB, [ @@ -475,7 +477,16 @@ if test "$msg_ldap" = yes; then if test -z "$LDAP_LIBS"; then AC_MSG_ERROR(could not find OpenLDAP libraries) elif test "$msg_ldap_linktype" = "(static)"; then - LDAP_LIBS="-Wl,-Bstatic $LDAP_LIBS -Wl,-Bdynamic" + case "$host" in + *solaris*) + if echo $LDAP_LIBS | grep -- "-lresolv" >/dev/null 2>&1; then + LDAP_LIBS=`echo $LDAP_LIBS | sed "s,-lresolv ,,g"` + LDAP_SHARED="-lresolv" + fi + ;; + esac + + LDAP_LIBS="-Wl,-Bstatic $LDAP_LIBS -Wl,-Bdynamic $LDAP_SHARED" fi AC_SUBST(LDAP_CFLAGS) |