[Nagios-checkins] nagios configure.in, 1.148, 1.149 configure, 1.145, 1.146

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	configure.in configure 
Log Message:
Set to search external libs, rather than include all the time (Allan Clark)

Index: configure
===================================================================
RCS file: /cvsroot/nagios/nagios/configure,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** configure	29 Sep 2009 09:50:32 -0000	1.145
--- configure	2 Oct 2009 08:35:20 -0000	1.146
***************
*** 5256,5266 ****

! { echo "$as_me:$LINENO: checking for main in -lnsl" >&5
! echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6; }
! if test "${ac_cv_lib_nsl_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   ac_check_lib_save_LIBS=$LIBS
! LIBS="-lnsl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
--- 5256,5265 ----

! { echo "$as_me:$LINENO: checking for library containing getservbyname" >&5
! echo $ECHO_N "checking for library containing getservbyname... $ECHO_C" >&6; }
! if test "${ac_cv_search_getservbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
***************
*** 5270,5283 ****
  /* end confdefs.h.  */

! 
  int
  main ()
  {
! return main ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (ac_try="$ac_link"
  case "(($ac_try" in
--- 5269,5295 ----
  /* end confdefs.h.  */

! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! char getservbyname ();
  int
  main ()
  {
! return getservbyname ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' nsl; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (ac_try="$ac_link"
  case "(($ac_try" in
***************
*** 5297,5325 ****
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
!   ac_cv_lib_nsl_main=yes
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5

! 	ac_cv_lib_nsl_main=no
  fi

  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
!       conftest$ac_exeext conftest.$ac_ext
! LIBS=$ac_check_lib_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
! echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6; }
! if test $ac_cv_lib_nsl_main = yes; then
    SOCKETLIBS="$SOCKETLIBS -lnsl"
  fi

! { echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
! echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
! if test "${ac_cv_lib_socket_socket+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   ac_check_lib_save_LIBS=$LIBS
! LIBS="-lsocket  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
--- 5309,5348 ----
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
!   ac_cv_search_getservbyname=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5

! 
  fi

  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
!       conftest$ac_exeext
!   if test "${ac_cv_search_getservbyname+set}" = set; then
!   break
  fi
! done
! if test "${ac_cv_search_getservbyname+set}" = set; then
!   :
! else
!   ac_cv_search_getservbyname=no
! fi
! rm conftest.$ac_ext
! LIBS=$ac_func_search_save_LIBS
! fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_getservbyname" >&5
! echo "${ECHO_T}$ac_cv_search_getservbyname" >&6; }
! ac_res=$ac_cv_search_getservbyname
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
    SOCKETLIBS="$SOCKETLIBS -lnsl"
  fi

! { echo "$as_me:$LINENO: checking for library containing connect" >&5
! echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6; }
! if test "${ac_cv_search_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
***************
*** 5335,5348 ****
  extern "C"
  #endif
! char socket ();
  int
  main ()
  {
! return socket ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (ac_try="$ac_link"
  case "(($ac_try" in
--- 5358,5378 ----
  extern "C"
  #endif
! char connect ();
  int
  main ()
  {
! return connect ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' socket; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (ac_try="$ac_link"
  case "(($ac_try" in
***************
*** 5362,5380 ****
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
!   ac_cv_lib_socket_socket=yes
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5

! 	ac_cv_lib_socket_socket=no
  fi

  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
!       conftest$ac_exeext conftest.$ac_ext
! LIBS=$ac_check_lib_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
! echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
! if test $ac_cv_lib_socket_socket = yes; then
    SOCKETLIBS="$SOCKETLIBS -lsocket"
  fi
--- 5392,5422 ----
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
!   ac_cv_search_connect=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5

! 
  fi

  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
!       conftest$ac_exeext
!   if test "${ac_cv_search_connect+set}" = set; then
!   break
  fi
! done
! if test "${ac_cv_search_connect+set}" = set; then
!   :
! else
!   ac_cv_search_connect=no
! fi
! rm conftest.$ac_ext
! LIBS=$ac_func_search_save_LIBS
! fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5
! echo "${ECHO_T}$ac_cv_search_connect" >&6; }
! ac_res=$ac_cv_search_connect
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
    SOCKETLIBS="$SOCKETLIBS -lsocket"
  fi

Index: configure.in
===================================================================
RCS file: /cvsroot/nagios/nagios/configure.in,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** configure.in	29 Sep 2009 09:50:32 -0000	1.148
--- configure.in	2 Oct 2009 08:35:20 -0000	1.149
***************
*** 102,107 ****

  dnl Checks for library functions.
! AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl")
! AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket")
  AC_SUBST(SOCKETLIBS)
  AC_CHECK_FUNCS(initgroups setenv strdup strstr strtoul unsetenv)
--- 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)

[Nagios-checkins] nagios configure.in, 1.148, 1.149 configure, 1.145, 1.146

Nagios network monitoring software is enterprise server monitoring

[Nagios-checkins] nagios configure.in, 1.148, 1.149 configure, 1.145, 1.146