mirror of
https://github.com/Cisco-Talos/clamav.git
synced 2026-05-04 13:43:17 -04:00
bb#1443
please don't touch the build stuff for a coupel of hours so i can easily revert this commit git-svn: trunk@4884
This commit is contained in:
@@ -1,3 +1,7 @@
|
||||
Mon Mar 2 17:37:15 CET 2009 (acab)
|
||||
-----------------------------------
|
||||
* build system: update to autoconf 2.63 (bb#1443)
|
||||
|
||||
Mon Mar 2 17:41:12 CET 2009 (tk)
|
||||
---------------------------------
|
||||
* clamscan/manager.c: make error reporting compatible with clamd and previous
|
||||
|
||||
@@ -277,6 +277,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
4
aclocal.m4
vendored
4
aclocal.m4
vendored
@@ -13,8 +13,8 @@
|
||||
|
||||
m4_ifndef([AC_AUTOCONF_VERSION],
|
||||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
||||
m4_if(AC_AUTOCONF_VERSION, [2.61],,
|
||||
[m4_warning([this file was generated for autoconf 2.61.
|
||||
m4_if(AC_AUTOCONF_VERSION, [2.63],,
|
||||
[m4_warning([this file was generated for autoconf 2.63.
|
||||
You have another version of autoconf. It may work, but is not guaranteed to.
|
||||
If you have problems, you may need to regenerate the build system entirely.
|
||||
To do so, use the procedure documented by the package, typically `autoreconf'.])])
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
/* clamav-config.h.in. Generated from configure.in by autoheader. */
|
||||
|
||||
/* Define if building universal (internal helper macro) */
|
||||
#undef AC_APPLE_UNIVERSAL_BUILD
|
||||
|
||||
/* mmap flag for anonymous maps */
|
||||
#undef ANONYMOUS_MAP
|
||||
|
||||
@@ -517,9 +520,18 @@
|
||||
/* Define to `long int' if <sys/types.h> does not define. */
|
||||
#undef off_t
|
||||
|
||||
/* Define to equivalent of C99 restrict keyword, or to nothing if this is not
|
||||
supported. Do not define if restrict is supported directly. */
|
||||
/* Define to the equivalent of the C99 'restrict' keyword, or to
|
||||
nothing if this is not supported. Do not define if restrict is
|
||||
supported directly. */
|
||||
#undef restrict
|
||||
/* Work around a bug in Sun C++: it does not support _Restrict, even
|
||||
though the corresponding Sun C compiler does, which causes
|
||||
"#define restrict _Restrict" in the previous line. Perhaps some future
|
||||
version of Sun C++ will work with _Restrict; if so, it'll probably
|
||||
define __RESTRICT, just as Sun C does. */
|
||||
#if defined __SUNPRO_CC && !defined __RESTRICT
|
||||
# define _Restrict
|
||||
#endif
|
||||
|
||||
/* Define to "int" if <sys/socket.h> does not define. */
|
||||
#undef socklen_t
|
||||
|
||||
@@ -263,6 +263,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_SOURCES = \
|
||||
|
||||
@@ -244,6 +244,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
clamconf_SOURCES = \
|
||||
|
||||
@@ -263,6 +263,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
@BUILD_CLAMD_TRUE@clamd_SOURCES = \
|
||||
|
||||
@@ -255,6 +255,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
@BUILD_CLAMD_TRUE@clamdscan_SOURCES = \
|
||||
|
||||
@@ -234,6 +234,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
@HAVE_CURSES_TRUE@man_MANS = $(top_builddir)/docs/man/clamdtop.1
|
||||
|
||||
@@ -246,6 +246,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
clamscan_SOURCES = \
|
||||
|
||||
66
configure.in
66
configure.in
@@ -605,7 +605,7 @@ want_getaddrinfo=$enableval, want_getaddrinfo="yes")
|
||||
if test "$want_getaddrinfo" = "yes"
|
||||
then
|
||||
AC_MSG_CHECKING([for getaddrinfo])
|
||||
AC_CACHE_VAL([have_gai],[
|
||||
AC_CACHE_VAL([have_cv_gai],[
|
||||
AC_TRY_RUN([
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
@@ -623,12 +623,12 @@ then
|
||||
return 0;
|
||||
}
|
||||
],
|
||||
[have_gai=yes],
|
||||
[have_gai=no],
|
||||
[have_gai=no])
|
||||
[have_cv_gai=yes],
|
||||
[have_cv_gai=no],
|
||||
[have_cv_gai=no])
|
||||
])
|
||||
AC_MSG_RESULT([$have_gai])
|
||||
if test "$have_gai" = yes; then
|
||||
AC_MSG_RESULT([$have_cv_gai])
|
||||
if test "$have_cv_gai" = yes; then
|
||||
AC_DEFINE(HAVE_GETADDRINFO, 1, [have getaddrinfo()])
|
||||
fi
|
||||
fi
|
||||
@@ -640,7 +640,7 @@ want_ipv6=$enableval, want_ipv6="yes")
|
||||
if test "$want_ipv6" = "yes"
|
||||
then
|
||||
AC_MSG_CHECKING([for IPv6 support])
|
||||
AC_CACHE_VAL([have_ipv6],[
|
||||
AC_CACHE_VAL([have_cv_ipv6],[
|
||||
AC_TRY_RUN([
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
@@ -663,12 +663,12 @@ then
|
||||
return 0;
|
||||
}
|
||||
],
|
||||
[have_ipv6=yes],
|
||||
[have_ipv6=no],
|
||||
[have_ipv6=no])
|
||||
[have_cv_ipv6=yes],
|
||||
[have_cv_ipv6=no],
|
||||
[have_cv_ipv6=no])
|
||||
])
|
||||
AC_MSG_RESULT([$have_ipv6])
|
||||
if test "$have_ipv6" = yes; then
|
||||
AC_MSG_RESULT([$have_cv_ipv6])
|
||||
if test "$have_cv_ipv6" = yes; then
|
||||
AC_DEFINE(SUPPORT_IPv6, 1, [Support for IPv6])
|
||||
fi
|
||||
fi
|
||||
@@ -1384,68 +1384,68 @@ dnl check for __attribute__((packed))
|
||||
dnl but only on compilers claiming to be gcc compatible
|
||||
dnl because for example Sun's compiler silently ignores the packed attribute.
|
||||
AC_MSG_CHECKING([for structure packing via __attribute__((packed))])
|
||||
AC_CACHE_VAL([have_attrib_packed],[
|
||||
AC_CACHE_VAL([have_cv_attrib_packed],[
|
||||
AC_TRY_COMPILE(,
|
||||
[#ifdef __GNUC__
|
||||
struct { int i __attribute__((packed)); } s;
|
||||
#else
|
||||
#error Only checking for packed attribute on gcc-like compilers
|
||||
#endif],
|
||||
[have_attrib_packed=yes],
|
||||
[have_attrib_packed=no])
|
||||
[have_cv_attrib_packed=yes],
|
||||
[have_cv_attrib_packed=no])
|
||||
])
|
||||
AC_MSG_RESULT([$have_attrib_packed])
|
||||
AC_MSG_RESULT([$have_cv_attrib_packed])
|
||||
|
||||
if test "$have_attrib_packed" = no; then
|
||||
if test "$have_cv_attrib_packed" = no; then
|
||||
AC_MSG_CHECKING([for structure packing via pragma])
|
||||
AC_CACHE_VAL([have_pragma_pack],[
|
||||
AC_CACHE_VAL([have_cv_pragma_pack],[
|
||||
AC_TRY_RUN([
|
||||
int main(int argc, char **argv) {
|
||||
#pragma pack(1) /* has to be in column 1 ! */
|
||||
struct { char c; long l; } s;
|
||||
return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; } ],
|
||||
[have_pragma_pack=yes],
|
||||
[have_pragma_pack=no])
|
||||
[have_cv_pragma_pack=yes],
|
||||
[have_cv_pragma_pack=no])
|
||||
])
|
||||
AC_MSG_RESULT([$have_pragma_pack])
|
||||
if test "$have_pragma_pack" = yes; then
|
||||
AC_MSG_RESULT([$have_cv_pragma_pack])
|
||||
if test "$have_cv_pragma_pack" = yes; then
|
||||
AC_DEFINE([HAVE_PRAGMA_PACK], 1, "pragma pack")
|
||||
else
|
||||
AC_MSG_CHECKING([for structure packing via hppa/hp-ux pragma])
|
||||
AC_CACHE_VAL([have_pragma_pack_hpux],[
|
||||
AC_CACHE_VAL([have_cv_pragma_pack_hpux],[
|
||||
AC_TRY_RUN([
|
||||
/* hppa/hp-ux wants pragma outside of function */
|
||||
#pragma pack 1 /* has to be in column 1 ! */
|
||||
struct { char c; long l; } s;
|
||||
int main(int argc, char **argv) {
|
||||
return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; } ],
|
||||
[have_pragma_pack_hpux=yes],
|
||||
[have_pragma_pack_hpux=no])
|
||||
[have_cv_pragma_pack_hpux=yes],
|
||||
[have_cv_pragma_pack_hpux=no])
|
||||
])
|
||||
AC_MSG_RESULT([$have_pragma_pack_hpux])
|
||||
AC_MSG_RESULT([$have_cv_pragma_pack_hpux])
|
||||
AC_DEFINE([HAVE_PRAGMA_PACK_HPPA], 1, "pragma pack hppa/hp-ux style")
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl check for __attribute__((aligned))
|
||||
AC_MSG_CHECKING([for type aligning via __attribute__((aligned))])
|
||||
AC_CACHE_VAL([have_attrib_aligned],[
|
||||
AC_CACHE_VAL([have_cv_attrib_aligned],[
|
||||
AC_TRY_COMPILE(,
|
||||
[typedef int cl_aligned_int __attribute__((aligned));],
|
||||
[have_attrib_aligned=yes],
|
||||
[have_attrib_aligned=no])
|
||||
[have_cv_attrib_aligned=yes],
|
||||
[have_cv_attrib_aligned=no])
|
||||
])
|
||||
AC_MSG_RESULT([$have_attrib_aligned])
|
||||
AC_MSG_RESULT([$have_cv_attrib_aligned])
|
||||
|
||||
if test "$have_attrib_packed" = no -a "$have_pragma_pack" = no -a "$have_pragma_pack_hpux" = no; then
|
||||
if test "$have_cv_attrib_packed" = no -a "$have_cv_pragma_pack" = no -a "$have_cv_pragma_pack_hpux" = no; then
|
||||
AC_MSG_ERROR(Need to know how to pack structures with this compiler)
|
||||
fi
|
||||
|
||||
if test "$have_attrib_packed" = yes; then
|
||||
if test "$have_cv_attrib_packed" = yes; then
|
||||
AC_DEFINE([HAVE_ATTRIB_PACKED], 1, [attrib packed])
|
||||
fi
|
||||
|
||||
if test "$have_attrib_aligned" = yes; then
|
||||
if test "$have_cv_attrib_aligned" = yes; then
|
||||
AC_DEFINE([HAVE_ATTRIB_ALIGNED], 1, [attrib aligned])
|
||||
fi
|
||||
|
||||
|
||||
@@ -222,6 +222,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
EXTRA_DIST = main.cvd daily.cvd
|
||||
|
||||
@@ -228,6 +228,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
EXTRA_DIST = html $(top_srcdir)/docs/man/*.in clamdoc.pdf clamdoc.tex clamav-mirror-howto.pdf clamav-mirror-howto.tex phishsigs_howto.tex phishsigs_howto.pdf signatures.pdf signatures.tex clam.eps
|
||||
|
||||
@@ -221,6 +221,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
EXTRA_DIST = clamd.conf freshclam.conf clamav-milter.conf
|
||||
|
||||
@@ -248,6 +248,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
freshclam_SOURCES = \
|
||||
|
||||
@@ -346,6 +346,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
SUBDIRS = lzma .
|
||||
|
||||
@@ -241,6 +241,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
AM_CFLAGS = -fPIC -DPIC
|
||||
|
||||
@@ -305,6 +305,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
@@ -245,6 +245,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
sigtool_SOURCES = \
|
||||
|
||||
@@ -203,6 +203,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
FILES = clam-v2.rar clam-v3.rar clam.cab clam.exe.bz2 clam.exe clam.zip \
|
||||
|
||||
@@ -248,6 +248,7 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
SPLIT_DIR = $(top_srcdir)/unit_tests/.split
|
||||
|
||||
Reference in New Issue
Block a user