revert last commit, it breaks bzip2 detection in /usr/local

git-svn: trunk@4163
0.95
Török Edvin 17 years ago
parent 8179270b95
commit 2d75763208
  1. 3
      Makefile.in
  2. 3
      clamav-milter/Makefile.in
  3. 3
      clamconf/Makefile.in
  4. 3
      clamd/Makefile.in
  5. 3
      clamdscan/Makefile.in
  6. 3
      clamscan/Makefile.in
  7. 1150
      configure
  8. 11
      configure.in
  9. 3
      database/Makefile.in
  10. 3
      docs/Makefile.in
  11. 3
      etc/Makefile.in
  12. 3
      freshclam/Makefile.in
  13. 3
      libclamav/Makefile.in
  14. 3
      libclamav/lzma/Makefile.in
  15. 3
      libclamunrar/Makefile.in
  16. 3
      libclamunrar_iface/Makefile.in
  17. 3
      sigtool/Makefile.in
  18. 3
      test/Makefile.in
  19. 3
      unit_tests/Makefile.in

@ -167,8 +167,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -178,7 +176,6 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -150,8 +150,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -161,7 +159,6 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -135,8 +135,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -146,7 +144,6 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -155,8 +155,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -166,7 +164,6 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -146,8 +146,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -157,7 +155,6 @@ LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @FRESHCLAM_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -137,8 +137,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -148,7 +146,6 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

1150
configure vendored

File diff suppressed because it is too large Load Diff

@ -330,13 +330,10 @@ _PKG_TEXT])])
CPPFLAGS="$CPPFLAGS $CHECK_CFLAGS"
save_LIBS="$LIBS"
if test -z "$CHECK_LIBS"; then
# when pkg-config is not available, use defaults
AC_LIB_LINKFLAGS([check])
LIBS="$LIBS -L$LIBCHECK_PREFIX/lib -lcheck"
CHECK_LIBS="$LTLIBCHECK"
else
LIBS="$LIBS $CHECK_LIBS"
# when pkg-config is not available, use defaults
CHECK_LIBS="-lcheck"
fi
LIBS="$LIBS $CHECK_LIBS"
AC_CHECK_HEADER(check.h,
[
AC_MSG_CHECKING([linking with check])
@ -351,7 +348,7 @@ _PKG_TEXT])])
],
[AC_MSG_RESULT([failed]);CHECK_LIBS=]
)
],[CHECK_LIBS=])
])
LIBS="$save_LIBS"
CPPFLAGS="$save_CPPFLAGS"
fi

@ -113,8 +113,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -124,7 +122,6 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -119,8 +119,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -130,7 +128,6 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -112,8 +112,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -123,7 +121,6 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -140,8 +140,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -151,7 +149,6 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -184,8 +184,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -195,7 +193,6 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -132,8 +132,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -143,7 +141,6 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -136,8 +136,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -147,7 +145,6 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -131,8 +131,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -142,7 +140,6 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -139,8 +139,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -150,7 +148,6 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -94,8 +94,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -105,7 +103,6 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

@ -134,8 +134,6 @@ LCOV = @LCOV@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
LIBCHECK = @LIBCHECK@
LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBGMP = @LIBGMP@
@ -145,7 +143,6 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBBZ2 = @LTLIBBZ2@
LTLIBCHECK = @LTLIBCHECK@
LTLIBGMP = @LTLIBGMP@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@

Loading…
Cancel
Save