callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix static linking on solaris which doesn't have a static libresolv.

Browse Source 
2002-04-04  JP Rosevear  <jpr@ximian.com>

	* configure.in: Fix static linking on solaris which doesn't have a
	static libresolv.

svn path=/trunk/; revision=16347
This commit is contained in:
JP Rosevear
2002-04-04 16:15:22 +00:00
committed by JP Rosevear
parent 78492a5deb
commit 2aca6e1151
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-04-04 JP Rosevear <jpr@ximian.com>
* configure.in: Fix static linking on solaris which doesn't have a
static libresolv.
2002-04-01 Chris Toshok <toshok@ximian.com>
* libversit/vobject.c (newStrItem): only include if USE_STRTBL is

13
configure.in
View File

@ -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)