fix --disable-cr switch

git-svn: trunk@1668
remotes/push_mirror/metadata
Tomasz Kojm 20 years ago
parent b1422b6f99
commit c4ce5fd58f
  1. 5
      clamav-devel/ChangeLog
  2. 4
      clamav-devel/configure
  3. 4
      clamav-devel/configure.in

@ -1,3 +1,8 @@
Tue Jul 26 02:54:18 CEST 2005
----------------------------------
* configure.in: --disable-cr was not working properly, reported by Stephane
Leclerc <sleclerc*aliastec.net>
Fri Jul 22 23:15:20 BST 2005 (njh) Fri Jul 22 23:15:20 BST 2005 (njh)
---------------------------------- ----------------------------------
* libclamav/pdf.c: Remove allocation of 0 bytes if ascii85decode decodes * libclamav/pdf.c: Remove allocation of 0 bytes if ascii85decode decodes

@ -11436,7 +11436,7 @@ fi;
# Check whether --enable-cr or --disable-cr was given. # Check whether --enable-cr or --disable-cr was given.
if test "${enable_cr+set}" = set; then if test "${enable_cr+set}" = set; then
enableval="$enable_cr" enableval="$enable_cr"
disable_cr=$enableval use_cr=$enableval
fi; fi;
# Check whether --enable-id-check or --disable-id-check was given. # Check whether --enable-id-check or --disable-id-check was given.
@ -11856,7 +11856,7 @@ _ACEOF
openbsd*) openbsd*)
if test "$have_pthreads" = "yes"; then if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread" LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
if test "$disable_cr" = "yes"; then if test "$use_cr" = "no"; then
CLAMD_LIBS="$CLAMD_LIBS -pthread" CLAMD_LIBS="$CLAMD_LIBS -pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread" CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
else else

@ -244,7 +244,7 @@ have_pthreads=$enableval,)
AC_ARG_ENABLE(cr, AC_ARG_ENABLE(cr,
[ --disable-cr don't link with C reentrant library (BSD) ], [ --disable-cr don't link with C reentrant library (BSD) ],
disable_cr=$enableval,) use_cr=$enableval,)
AC_ARG_ENABLE(id-check, AC_ARG_ENABLE(id-check,
[ --enable-id-check use id utility instead of /etc/passwd parsing], [ --enable-id-check use id utility instead of /etc/passwd parsing],
@ -424,7 +424,7 @@ dragonfly*)
openbsd*) openbsd*)
if test "$have_pthreads" = "yes"; then if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread" LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
if test "$disable_cr" = "yes"; then if test "$use_cr" = "no"; then
CLAMD_LIBS="$CLAMD_LIBS -pthread" CLAMD_LIBS="$CLAMD_LIBS -pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread" CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
else else

Loading…
Cancel
Save