@@ -1,3 +1,7 @@

+Tue Jan 22 11:28:20 CET 2008 (tk)

+---------------------------------

+  * configure: don't link with nsl if not needed (bb#754)

+

 Tue Jan 22 11:20:12 CET 2008 (tk)

 ---------------------------------

   * shared/misc.c, clamd, clamscan, freshclam: respect custom dbdir settings

@@ -11234,13 +11234,12 @@ if test $ac_cv_lib_socket_bind = yes; then

   LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"

 fi

-{ echo "$as_me:$LINENO: checking for gethostent in -lnsl" >&5

-echo $ECHO_N "checking for gethostent in -lnsl... $ECHO_C" >&6; }

-if test "${ac_cv_lib_nsl_gethostent+set}" = set; then

+{ echo "$as_me:$LINENO: checking for library containing gethostent" >&5

+echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6; }

+if test "${ac_cv_search_gethostent+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6

 else

-  ac_check_lib_save_LIBS=$LIBS

-LIBS="-lnsl  $LIBS"

+  ac_func_search_save_LIBS=$LIBS

 cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

@@ -11263,7 +11262,14 @@ return gethostent ();

   return 0;

 }

 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext

+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

   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

@@ -11281,22 +11287,34 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

 	 test ! -s conftest.err

        } && test -s conftest$ac_exeext &&

        $as_test_x conftest$ac_exeext; then

-  ac_cv_lib_nsl_gethostent=yes

+  ac_cv_search_gethostent=$ac_res

 else

   echo "$as_me: failed program was:" >&5

 sed 's/^/| /' conftest.$ac_ext >&5

-	ac_cv_lib_nsl_gethostent=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

+      conftest$ac_exeext

+  if test "${ac_cv_search_gethostent+set}" = set; then

+  break

+fi

+done

+if test "${ac_cv_search_gethostent+set}" = set; then

+  :

+else

+  ac_cv_search_gethostent=no

+fi

+rm conftest.$ac_ext

+LIBS=$ac_func_search_save_LIBS

 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostent" >&5

-echo "${ECHO_T}$ac_cv_lib_nsl_gethostent" >&6; }

-if test $ac_cv_lib_nsl_gethostent = yes; then

-  LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl"

+{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5

+echo "${ECHO_T}$ac_cv_search_gethostent" >&6; }

+ac_res=$ac_cv_search_gethostent

+if test "$ac_res" != no; then

+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

+  (LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")

 fi

@@ -211,7 +211,7 @@ if test "$enable_experimental" = "yes"; then

 fi

 AC_CHECK_LIB(socket, bind, [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])

-AC_CHECK_LIB(nsl, gethostent, [LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl"])

+AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])

 dnl we need to try to link with iconv, otherwise there could be a 

 dnl mismatch between a 32-bit and 64-bit lib. Detect this at configure time.