@@ -1,3 +1,8 @@

+Wed Oct  6 21:36:59 CEST 2004 (tk)

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

+  * configure: improve --disable-dns behaviour (patch by Tom G. Christensen

+	       <tgc*statsbiblioteket.dk>)

+

 Wed Oct  6 20:48:17 CEST 2004 (tk)

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

   * freshclam/manager.c: fix download problems with some proxy servers

@@ -46,7 +46,7 @@ while test $# -gt 0; do

 	;;

     --version)

-	echo devel-20041003

+	echo devel-20041006

 	exit 0

 	;;

@@ -1016,7 +1016,8 @@ Optional Features:

   --enable-fast-install=PKGS  optimize for fast installation default=yes

   --disable-libtool-lock  avoid locking (might break parallel builds)

   --disable-bzip2	  disable bzip2 support

-  --disable-dns	          disable support for database verification through DNS

+  --disable-dns           disable support for database verification through

+                          DNS

   --disable-clamuko	  disable clamuko support (Linux and FreeBSD only)

   --enable-milter	  build clamav-milter

   --disable-dsig	  disable support for digital signatures

@@ -5017,7 +5018,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

 case $host in

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 5020 "configure"' > conftest.$ac_ext

+  echo '#line 5021 "configure"' > conftest.$ac_ext

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -5590,7 +5591,7 @@ chmod -w .

 save_CFLAGS="$CFLAGS"

 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"

 compiler_c_o=no

-if { (eval echo configure:5593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then

+if { (eval echo configure:5594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then

   # The compiler can only warn and ignore the option if not recognized

   # So say no if there are warnings

   if test -s out/conftest.err; then

@@ -7517,7 +7518,7 @@ else

     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 7520 "configure"

+#line 7521 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -7615,7 +7616,7 @@ else

     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 7618 "configure"

+#line 7619 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -10538,84 +10539,16 @@ fi

 fi

-want_dns="yes"

 # Check whether --enable-dns or --disable-dns was given.

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

   enableval="$enable_dns"

-  want_dns="no"

-fi;

-

-if test "$want_dns" = "yes"

-then

-    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_lib_resolv___dn_expand+set}" = set; then

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

-else

-  ac_check_lib_save_LIBS=$LIBS

-LIBS="-lresolv  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-

-/* Override any gcc2 internal prototype to avoid an error.  */

-#ifdef __cplusplus

-extern "C"

-#endif

-/* We use char because int might match the return type of a gcc2

-   builtin and then its argument prototype would still apply.  */

-char __dn_expand ();

-int

-main ()

-{

-__dn_expand ();

-  ;

-  return 0;

-}

-_ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&

-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'

-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

-  (eval $ac_try) 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

-  (eval $ac_try) 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

-  ac_cv_lib_resolv___dn_expand=yes

+  want_dns=$enableval

 else

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

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

+  want_dns=yes

-ac_cv_lib_resolv___dn_expand=no

-fi

-rm -f conftest.err conftest.$ac_objext \

-      conftest$ac_exeext conftest.$ac_ext

-LIBS=$ac_check_lib_save_LIBS

-fi

-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5

-echo "${ECHO_T}$ac_cv_lib_resolv___dn_expand" >&6

-if test $ac_cv_lib_resolv___dn_expand = yes; then

-  resolv_lib="-lresolv"

-fi

-

-    if test -z "$resolv_lib"; then

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

+fi;

+if test $want_dns = yes; then

+    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_lib_resolv_dn_expand+set}" = set; then

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

@@ -10682,7 +10615,6 @@ if test $ac_cv_lib_resolv_dn_expand = yes; then

   resolv_lib="-lresolv"

 fi

-    fi

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

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

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

@@ -86,17 +86,12 @@ then

     AC_CHECK_HEADER(bzlib.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lbz2"; AC_DEFINE(HAVE_BZLIB_H,1,have bzip2)], AC_MSG_WARN([****** bzip2 support disabled]))

 fi

-want_dns="yes"

 AC_ARG_ENABLE(dns,

-[  --disable-dns	          disable support for database verification through DNS],

-want_dns="no",)

-

-if test "$want_dns" = "yes"

-then

-    AC_CHECK_LIB(resolv, __dn_expand, resolv_lib="-lresolv",)

-    if test -z "$resolv_lib"; then

-      AC_CHECK_LIB(resolv, dn_expand, resolv_lib="-lresolv",)

-    fi

+    AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]),

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

+)

+if test $want_dns = yes; then

+    AC_CHECK_LIB(resolv, dn_expand, resolv_lib="-lresolv")

     AC_CHECK_HEADER(resolv.h,[FRESHCLAM_LIBS="$FRESHCLAM_LIBS $resolv_lib"; AC_DEFINE(HAVE_RESOLV_H,1,have resolv.h)], AC_MSG_WARN([****** DNS support disabled]))

 fi