work around non reentrant lresolv

git-svn: trunk@4087
remotes/push_mirror/0.95
aCaB 18 years ago
parent 0217341d91
commit 55144c4766
  1. 4
      ChangeLog
  2. 3
      Makefile.in
  3. 1
      aclocal.m4
  4. 3
      clamav-config.h.in
  5. 3
      clamav-milter/Makefile.in
  6. 22
      clamav-milter/clamav-milter.c
  7. 3
      clamconf/Makefile.in
  8. 3
      clamd/Makefile.in
  9. 3
      clamdscan/Makefile.in
  10. 3
      clamscan/Makefile.in
  11. 183
      configure
  12. 19
      configure.in
  13. 3
      database/Makefile.in
  14. 3
      docs/Makefile.in
  15. 3
      etc/Makefile.in
  16. 3
      freshclam/Makefile.in
  17. 3
      libclamav/Makefile.in
  18. 3
      libclamav/lzma/Makefile.in
  19. 3
      libclamunrar/Makefile.in
  20. 3
      libclamunrar_iface/Makefile.in
  21. 70
      m4/resolv.m4
  22. 3
      sigtool/Makefile.in
  23. 3
      test/Makefile.in
  24. 3
      unit_tests/Makefile.in

@ -1,3 +1,7 @@
Wed Aug 6 02:11:12 CEST 2008 (acab)
------------------------------------
* build system, clamav-milter: work around for non MT lresolv (bb#1125)
Tue Aug 5 13:14:31 CEST 2008 (acab)
------------------------------------
* clamav-milter: properly wrap dns stuff (again) - bb#1125

@ -72,7 +72,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

1
aclocal.m4 vendored

@ -7791,3 +7791,4 @@ m4_include([m4/acinclude.m4])
m4_include([m4/fdpassing.m4])
m4_include([m4/lib-link.m4])
m4_include([m4/lib-prefix.m4])
m4_include([m4/resolv.m4])

@ -177,6 +177,9 @@
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
/* Define to 1 if -lresolv provides thread safe API's like res_nquery */
#undef HAVE_LRESOLV_R
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H

@ -58,7 +58,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in INSTALL
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -590,11 +590,12 @@ static table_t *resolve(const char *host, table_t *t);
static int spf(struct privdata *privdata, table_t *prevhosts);
static void spf_ip(char *ip, int zero, void *v);
pthread_mutex_t res_pool_mutex = PTHREAD_MUTEX_INITIALIZER;
#ifdef HAVE_LRESOLV_R
res_state res_pool;
uint8_t *res_pool_state;
pthread_cond_t res_pool_cond = PTHREAD_COND_INITIALIZER;
pthread_mutex_t res_pool_mutex = PTHREAD_MUTEX_INITIALIZER;
int safe_res_query(const char *d, int c, int t, u_char *a, int l) {
int i = -1, ret;
@ -620,7 +621,20 @@ int safe_res_query(const char *d, int c, int t, u_char *a, int l) {
pthread_cond_signal(&res_pool_cond);
pthread_mutex_unlock(&res_pool_mutex);
return ret;
}
}
#else /* !HAVE_LRESOLV_R - non thread safe resolver (old bsd's) */
int safe_res_query(const char *d, int c, int t, u_char *a, int l) {
int ret;
pthread_mutex_lock(&res_pool_mutex);
ret = res_query(d, c, t, a, l);
pthread_mutex_unlock(&res_pool_mutex);
return ret;
}
#endif /* HAVE_LRESOLV_R */
#endif /* HAVE_RESOLV_H */
static void
@ -1393,7 +1407,7 @@ main(int argc, char **argv)
if((max_children == 0) && ((cpt = cfgopt(copt, "MaxThreads")) != NULL))
max_children = cfgopt(copt, "MaxThreads")->numarg;
#ifdef HAVE_RESOLV_H
#ifdef HAVE_LRESOLV_R
/* allocate a pool of resolvers */
if(!(res_pool=cli_calloc(max_children+1, sizeof(*res_pool))))
return EX_OSERR;

@ -57,7 +57,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -57,7 +57,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -57,7 +57,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -58,7 +58,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

183
configure vendored

@ -15350,6 +15350,8 @@ _ACEOF
fi
fi
# Check whether --enable-dns was given.
if test "${enable_dns+set}" = set; then
enableval=$enable_dns; want_dns=$enableval
@ -15359,43 +15361,33 @@ else
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 "$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
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lresolv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* 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 __dn_expand ();
int
main ()
{
return __dn_expand ();
;
return 0;
}
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
#include <resolv.h>
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
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
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@ -15404,55 +15396,38 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_lib_resolv___dn_expand=yes
} && test -s conftest.$ac_objext; then
ac_cv_header_resolv_h=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_resolv___dn_expand=no
ac_cv_header_resolv_h=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_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"
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_resolv_h" >&5
echo "${ECHO_T}$ac_cv_header_resolv_h" >&6; }
if test $ac_cv_header_resolv_h = yes; then
if test -z "$resolv_lib"; then
{ echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
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_lib_resolv_dn_expand+set}" = set; then
if test "${ac_cv_have_lresolv+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 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 dn_expand ();
int
main ()
{
return dn_expand ();
;
return 0;
}
ac_cv_have_lresolv=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"
@ -15472,52 +15447,61 @@ 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_resolv_dn_expand=yes
ac_cv_have_lresolv=yes;
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_resolv_dn_expand=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_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"
{ echo "$as_me:$LINENO: result: $ac_cv_have_lresolv" >&5
echo "${ECHO_T}$ac_cv_have_lresolv" >&6; }
LIBS=$bklibs;
fi
fi
{ 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
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;
cat >>confdefs.h <<\_ACEOF
#define HAVE_RESOLV_H 1
_ACEOF
{ echo "$as_me:$LINENO: checking for res_nquery in -lresolv" >&5
echo $ECHO_N "checking for res_nquery in -lresolv... $ECHO_C" >&6; }
if test "${ac_cv_have_lresolv_r+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
ac_cv_have_lresolv_r=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)res_nquery; }
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
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_compile") 2>conftest.er1
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@ -15526,32 +15510,39 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_header_resolv_h=yes
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
ac_cv_have_lresolv_r=yes;
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_resolv_h=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
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_header_resolv_h" >&5
echo "${ECHO_T}$ac_cv_header_resolv_h" >&6; }
if test $ac_cv_header_resolv_h = yes; then
FRESHCLAM_LIBS="$FRESHCLAM_LIBS $resolv_lib"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $resolv_lib";
{ echo "$as_me:$LINENO: result: $ac_cv_have_lresolv_r" >&5
echo "${ECHO_T}$ac_cv_have_lresolv_r" >&6; }
LIBS=$bklibs;
if test "x$ac_cv_have_lresolv_r" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_RESOLV_H 1
#define HAVE_LRESOLV_R 1
_ACEOF
else
{ echo "$as_me:$LINENO: WARNING: ****** DNS support disabled" >&5
fi
else
{ echo "$as_me:$LINENO: WARNING: ****** DNS support disabled" >&5
echo "$as_me: WARNING: ****** DNS support disabled" >&2;}
fi
fi
fi
# Check whether --enable-clamuko was given.
if test "${enable_clamuko+set}" = set; then
@ -15803,6 +15794,10 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
fi
if test "x$ac_cv_have_lresolv_r" != "xyes"; then
{ echo "$as_me:$LINENO: WARNING: ****** Your libresolv is not thread safe, SPF queries in clamav-milter will block" >&5
echo "$as_me: WARNING: ****** Your libresolv is not thread safe, SPF queries in clamav-milter will block" >&2;}
fi
fi
# Check whether --enable-dsig was given.

@ -520,21 +520,7 @@ then
fi
fi
AC_ARG_ENABLE([dns],
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"],)
if test -z "$resolv_lib"; then
AC_CHECK_LIB([resolv], [dn_expand], [resolv_lib="-lresolv"],)
fi
AC_CHECK_HEADER([resolv.h],[FRESHCLAM_LIBS="$FRESHCLAM_LIBS $resolv_lib"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $resolv_lib"; AC_DEFINE([HAVE_RESOLV_H],1,[have resolv.h])], AC_MSG_WARN([****** DNS support disabled]), [
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
])
fi
AC_C_DNS
AC_ARG_ENABLE([clamuko],
[ --disable-clamuko disable clamuko support (Linux, DragonFly and FreeBSD only)],
@ -593,6 +579,9 @@ if test "$have_milter" = "yes"; then
AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_B], $sendmailver_b, [minor version of Sendmail])
AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_C], $sendmailver_c, [subversion of Sendmail])
fi
if test "x$ac_cv_have_lresolv_r" != "xyes"; then
AC_MSG_WARN([****** Your libresolv is not thread safe, SPF queries in clamav-milter will block])
fi
fi
AC_ARG_ENABLE([dsig],

@ -56,7 +56,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -55,7 +55,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -55,7 +55,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -58,7 +58,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -59,7 +59,8 @@ DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -57,7 +57,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -43,7 +43,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -43,7 +43,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -0,0 +1,70 @@
dnl AC_C_DNS
dnl Checks resolv.h presence and usability
dnl Checks for specific lresolv exports
dnl Checks for lresolve reentrance
dnl
dnl Note using AC_LINK_IFELSE instead of AC_CHECK_LIB
dnl as symbols are often redefined in resolv.h
AC_DEFUN([AC_C_DNS], [
AC_ARG_ENABLE([dns],
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_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_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=yes;
])
])
LIBS=$bklibs;
],
[],
[
#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;
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_LINK_IFELSE([
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
#include <resolv.h>
int main() { return (int)res_nquery; }
],
[
ac_cv_have_lresolv_r=yes;
]),
])
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
else
AC_MSG_WARN([****** DNS support disabled])
fi
fi
])

@ -57,7 +57,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -37,7 +37,8 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@ -43,7 +43,8 @@ DIST_COMMON = $(am__dist_bin_SCRIPTS_DIST) $(srcdir)/Makefile.am \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

Loading…
Cancel
Save