From c4ce5fd58f6591d7e2f628124d084997d5ef2dd9 Mon Sep 17 00:00:00 2001 From: Tomasz Kojm Date: Tue, 26 Jul 2005 00:57:10 +0000 Subject: [PATCH] fix --disable-cr switch git-svn: trunk@1668 --- clamav-devel/ChangeLog | 5 +++++ clamav-devel/configure | 4 ++-- clamav-devel/configure.in | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog index 27bae03d3..3a15821c4 100644 --- a/clamav-devel/ChangeLog +++ b/clamav-devel/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 26 02:54:18 CEST 2005 +---------------------------------- + * configure.in: --disable-cr was not working properly, reported by Stephane + Leclerc + Fri Jul 22 23:15:20 BST 2005 (njh) ---------------------------------- * libclamav/pdf.c: Remove allocation of 0 bytes if ascii85decode decodes diff --git a/clamav-devel/configure b/clamav-devel/configure index 64bf84bdd..8ca7bc264 100755 --- a/clamav-devel/configure +++ b/clamav-devel/configure @@ -11436,7 +11436,7 @@ fi; # Check whether --enable-cr or --disable-cr was given. if test "${enable_cr+set}" = set; then enableval="$enable_cr" - disable_cr=$enableval + use_cr=$enableval fi; # Check whether --enable-id-check or --disable-id-check was given. @@ -11856,7 +11856,7 @@ _ACEOF openbsd*) if test "$have_pthreads" = "yes"; then LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread" - if test "$disable_cr" = "yes"; then + if test "$use_cr" = "no"; then CLAMD_LIBS="$CLAMD_LIBS -pthread" CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread" else diff --git a/clamav-devel/configure.in b/clamav-devel/configure.in index b85b565a6..2e97661b9 100644 --- a/clamav-devel/configure.in +++ b/clamav-devel/configure.in @@ -244,7 +244,7 @@ have_pthreads=$enableval,) AC_ARG_ENABLE(cr, [ --disable-cr don't link with C reentrant library (BSD) ], -disable_cr=$enableval,) +use_cr=$enableval,) AC_ARG_ENABLE(id-check, [ --enable-id-check use id utility instead of /etc/passwd parsing], @@ -424,7 +424,7 @@ dragonfly*) openbsd*) if test "$have_pthreads" = "yes"; then LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread" - if test "$disable_cr" = "yes"; then + if test "$use_cr" = "no"; then CLAMD_LIBS="$CLAMD_LIBS -pthread" CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread" else