From 2aca6e115141bdc738da589c5d0395eba2a0e346 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 4 Apr 2002 16:15:22 +0000 Subject: Fix static linking on solaris which doesn't have a static libresolv. 2002-04-04 JP Rosevear * configure.in: Fix static linking on solaris which doesn't have a static libresolv. svn path=/trunk/; revision=16347 --- ChangeLog | 5 +++++ configure.in | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5a515a092e..3d410222cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-04 JP Rosevear + + * configure.in: Fix static linking on solaris which doesn't have a + static libresolv. + 2002-04-01 Chris Toshok * libversit/vobject.c (newStrItem): only include if USE_STRTBL is 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) -- cgit v1.2.3