[Nagios-checkins] nagios configure.in, 1.149, 1.150 configure, 1.146, 1.147

[Ton V. <to...@us...>]

Update of /cvsroot/nagios/nagios
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24429

Modified Files:
	configure.in configure 
Log Message:
Libraries incorrectly excluded in last commit


Index: configure
===================================================================
RCS file: /cvsroot/nagios/nagios/configure,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** configure	2 Oct 2009 08:35:20 -0000	1.146
--- configure	2 Oct 2009 09:01:15 -0000	1.147
***************
*** 5336,5340 ****
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
!   SOCKETLIBS="$SOCKETLIBS -lnsl"
  fi
  
--- 5336,5342 ----
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
!   if test "$ac_cv_search_getservbyname" != "none required"; then
! 		SOCKETLIBS="$SOCKETLIBS -lnsl"
! 	fi
  fi
  
***************
*** 5419,5423 ****
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
!   SOCKETLIBS="$SOCKETLIBS -lsocket"
  fi
  
--- 5421,5427 ----
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
!   if test "$ac_cv_search_connect" != "none required"; then
! 		SOCKETLIBS="$SOCKETLIBS -lsocket"
! 	fi
  fi
  

Index: configure.in
===================================================================
RCS file: /cvsroot/nagios/nagios/configure.in,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -d -r1.149 -r1.150
*** configure.in	2 Oct 2009 08:35:20 -0000	1.149
--- configure.in	2 Oct 2009 09:01:15 -0000	1.150
***************
*** 102,107 ****
  
  dnl Checks for library functions.
! AC_SEARCH_LIBS([getservbyname],[nsl],[SOCKETLIBS="$SOCKETLIBS -lnsl"])
! AC_SEARCH_LIBS([connect],[socket],[SOCKETLIBS="$SOCKETLIBS -lsocket"])
  AC_SUBST(SOCKETLIBS)
  AC_CHECK_FUNCS(initgroups setenv strdup strstr strtoul unsetenv)
--- 102,113 ----
  
  dnl Checks for library functions.
! AC_SEARCH_LIBS([getservbyname],[nsl],
! 	[if test "$ac_cv_search_getservbyname" != "none required"; then
! 		SOCKETLIBS="$SOCKETLIBS -lnsl"
! 	fi])
! AC_SEARCH_LIBS([connect],[socket],
! 	[if test "$ac_cv_search_connect" != "none required"; then
! 		SOCKETLIBS="$SOCKETLIBS -lsocket"
! 	fi])
  AC_SUBST(SOCKETLIBS)
  AC_CHECK_FUNCS(initgroups setenv strdup strstr strtoul unsetenv)