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

+Tue Aug 12 00:08:05 CEST 2008 (acab)

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

+  * m4/resolv.m4: fix logic in -lresolv checks

+

 Mon Aug 11 17:53:03 CEST 2008 (acab)

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

   * libclamav/pdf.c: count skipped files too - bb#1128

@@ -15361,6 +15361,7 @@ else

 fi

 if test $want_dns = yes; then

+    ac_cv_have_lresolv=no

     { echo "$as_me:$LINENO: checking for resolv.h" >&5

 echo $ECHO_N "checking for resolv.h... $ECHO_C" >&6; }

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

@@ -15411,15 +15412,67 @@ fi

 echo "${ECHO_T}$ac_cv_header_resolv_h" >&6; }

 if test $ac_cv_header_resolv_h = yes; then

-	    bklibs=$LIBS;

-	    LIBS=-lresolv;

+	    { echo "$as_me:$LINENO: checking for dn_expand in std libs" >&5

+echo $ECHO_N "checking for dn_expand in std libs... $ECHO_C" >&6; }

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

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

+else

+

+	    	ac_cv_have_lresolv_std='no'

+	        cat >conftest.$ac_ext <<_ACEOF

+

+#include <sys/types.h>

+#include <netinet/in.h>

+#include <arpa/nameser.h>

+#include <resolv.h>

+int main() { return (int)dn_expand; }

+

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

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

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

+

+		    ac_cv_have_lresolv_std='yes'

+		    ac_cv_have_lresolv=''

+

+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 conftest.$ac_ext

+

+fi

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

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

+	    if test "x$ac_cv_have_lresolv" = "xno"; then

+	    bklibs=$LIBS

+	    LIBS=-lresolv

 	    { echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5

 echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6; }

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

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

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

 else

-	        ac_cv_have_lresolv=no;

+		ac_cv_have_lresolv_lresolv='yes'

 		cat >conftest.$ac_ext <<_ACEOF

 #include <sys/types.h>

@@ -15448,7 +15501,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

        } && test -s conftest$ac_exeext &&

        $as_test_x conftest$ac_exeext; then

-		    ac_cv_have_lresolv=yes;

+		    ac_cv_have_lresolv_lresolv='yes'

+		    ac_cv_have_lresolv=' -lresolv'

 else

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

@@ -15461,18 +15515,21 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

       conftest$ac_exeext conftest.$ac_ext

 fi

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

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

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

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

 	    LIBS=$bklibs;

+	    fi

+else

+   ac_cv_have_lresolv=no

 fi

-    if test "x$ac_cv_have_lresolv" = "xyes"; then

-    	FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv";

-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv";

-	bklibs=$LIBS;

-	LIBS=-lresolv;

+    if test "x$ac_cv_have_lresolv" != "xno"; then

+    	FRESHCLAM_LIBS="$FRESHCLAM_LIBS$ac_cv_have_lresolv"

+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS$ac_cv_have_lresolv"

+	bklibs=$LIBS

+	LIBS=$ac_cv_have_lresolv;

 cat >>confdefs.h <<\_ACEOF

 #define HAVE_RESOLV_H 1

@@ -15513,7 +15570,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

        } && test -s conftest$ac_exeext &&

        $as_test_x conftest$ac_exeext; then

-	        ac_cv_have_lresolv_r=yes;

+	        ac_cv_have_lresolv_r=yes

 else

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

@@ -15528,7 +15585,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

 fi

 { echo "$as_me:$LINENO: result: $ac_cv_have_lresolv_r" >&5

 echo "${ECHO_T}$ac_cv_have_lresolv_r" >&6; }

-	LIBS=$bklibs;

+	LIBS=$bklibs

 	if test "x$ac_cv_have_lresolv_r" = "xyes"; then

 cat >>confdefs.h <<\_ACEOF

@@ -13,12 +13,28 @@ AC_ARG_ENABLE([dns],

     [want_dns=$enableval], [want_dns=yes]

 )

 if test $want_dns = yes; then

+    ac_cv_have_lresolv=no

     AC_CHECK_HEADER([resolv.h],

 	[

-	    bklibs=$LIBS;

-	    LIBS=-lresolv;

-	    AC_CACHE_CHECK([for dn_expand in -lresolv], [ac_cv_have_lresolv], [

-	        ac_cv_have_lresolv=no;

+	    AC_CACHE_CHECK([for dn_expand in std libs], [ac_cv_have_lresolv_std], [

+	    	ac_cv_have_lresolv_std='no'

+	        AC_LINK_IFELSE([

+#include <sys/types.h>

+#include <netinet/in.h>

+#include <arpa/nameser.h>

+#include <resolv.h>

+int main() { return (int)dn_expand; }

+		],

+		[

+		    ac_cv_have_lresolv_std='yes'

+		    ac_cv_have_lresolv=''

+		])

+	    ])

+	    if test "x$ac_cv_have_lresolv" = "xno"; then

+	    bklibs=$LIBS

+	    LIBS=-lresolv

+	    AC_CACHE_CHECK([for dn_expand in -lresolv], [ac_cv_have_lresolv_lresolv], [

+		ac_cv_have_lresolv_lresolv='yes'

 		AC_LINK_IFELSE([

 #include <sys/types.h>

 #include <netinet/in.h>

@@ -27,25 +43,27 @@ if test $want_dns = yes; then

 int main() { return (int)dn_expand; }

     	     	],

 		[

-		    ac_cv_have_lresolv=yes;

+		    ac_cv_have_lresolv_lresolv='yes'

+		    ac_cv_have_lresolv=' -lresolv'

 		])

 	    ])

 	    LIBS=$bklibs;

+	    fi

 	],

-	[],

+	[ ac_cv_have_lresolv=no ],

 	[

 #include <sys/types.h>

 #include <netinet/in.h>

 #include <arpa/nameser.h>

     ])

-    if test "x$ac_cv_have_lresolv" = "xyes"; then

-    	FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv";

-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv";

-	bklibs=$LIBS;

-	LIBS=-lresolv;

+    if test "x$ac_cv_have_lresolv" != "xno"; then

+    	FRESHCLAM_LIBS="$FRESHCLAM_LIBS$ac_cv_have_lresolv"

+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS$ac_cv_have_lresolv"

+	bklibs=$LIBS

+	LIBS=$ac_cv_have_lresolv

 	AC_DEFINE([HAVE_RESOLV_H],1,[have resolv.h])

 	AC_CACHE_CHECK([for res_nquery in -lresolv], [ac_cv_have_lresolv_r], [

-	    ac_cv_have_lresolv_r=no;

+	    ac_cv_have_lresolv_r='no'

 	    AC_LINK_IFELSE([

 #include <sys/types.h>

 #include <netinet/in.h>

@@ -54,10 +72,10 @@ int main() { return (int)dn_expand; }

 int main() { return (int)res_nquery; }

     	    ],

 	    [

-	        ac_cv_have_lresolv_r=yes;

+	        ac_cv_have_lresolv_r='yes'

 	    ]),

 	])

-	LIBS=$bklibs;

+	LIBS=$bklibs

 	if test "x$ac_cv_have_lresolv_r" = "xyes"; then

 	    AC_DEFINE([HAVE_LRESOLV_R],1,[Define to 1 if -lresolv provides thread safe API's like res_nquery])

 	fi