r2144 - branches/1.1

[des at projects.linpro.no]

Author: des
Date: 2007-10-19 13:35:54 +0200 (Fri, 19 Oct 2007)
New Revision: 2144

Modified:
   branches/1.1/
   branches/1.1/configure.ac
Log:
Merged revisions 2097 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2097 | des | 2007-10-10 15:23:15 +0200 (Wed, 10 Oct 2007) | 2 lines
  
  Fix braino in Solaris compat bit.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2078-2079,2088,2133
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2078-2079,2088,2097,2133

Modified: branches/1.1/configure.ac
===================================================================
--- branches/1.1/configure.ac	2007-10-19 11:35:48 UTC (rev 2143)
+++ branches/1.1/configure.ac	2007-10-19 11:35:54 UTC (rev 2144)
@@ -53,7 +53,7 @@
 save_LIBS="${LIBS}"
 LIBS=""
 AC_CHECK_LIB(socket, socket)
-AC_CHECK_LIB(getaddrinfo, ns)
+AC_CHECK_LIB(nsl, getaddrinfo)
 NET_LIBS="${LIBS}"
 LIBS="${save_LIBS}"
 AC_SUBST(NET_LIBS)