Browse code

fix --disable-cr switch

git-svn: trunk@1668

Tomasz Kojm authored on 2005/07/26 09:57:10
Showing 3 changed files
... ...
@@ -1,3 +1,8 @@
1
+Tue Jul 26 02:54:18 CEST 2005
2
+----------------------------------
3
+  * configure.in: --disable-cr was not working properly, reported by Stephane
4
+		  Leclerc <sleclerc*aliastec.net>
5
+
1 6
 Fri Jul 22 23:15:20 BST 2005 (njh)
2 7
 ----------------------------------
3 8
   * libclamav/pdf.c:	Remove allocation of 0 bytes if ascii85decode decodes
... ...
@@ -11436,7 +11436,7 @@ fi;
11436 11436
 # Check whether --enable-cr or --disable-cr was given.
11437 11437
 if test "${enable_cr+set}" = set; then
11438 11438
   enableval="$enable_cr"
11439
-  disable_cr=$enableval
11439
+  use_cr=$enableval
11440 11440
 fi;
11441 11441
 
11442 11442
 # Check whether --enable-id-check or --disable-id-check was given.
... ...
@@ -11856,7 +11856,7 @@ _ACEOF
11856 11856
 openbsd*)
11857 11857
     if test "$have_pthreads" = "yes"; then
11858 11858
 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
11859
-	if test "$disable_cr" = "yes"; then
11859
+	if test "$use_cr" = "no"; then
11860 11860
 	    CLAMD_LIBS="$CLAMD_LIBS -pthread"
11861 11861
 	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
11862 11862
 	else
... ...
@@ -244,7 +244,7 @@ have_pthreads=$enableval,)
244 244
 
245 245
 AC_ARG_ENABLE(cr,
246 246
 [  --disable-cr		  don't link with C reentrant library (BSD) ],
247
-disable_cr=$enableval,)
247
+use_cr=$enableval,)
248 248
 
249 249
 AC_ARG_ENABLE(id-check,
250 250
 [  --enable-id-check	  use id utility instead of /etc/passwd parsing],
... ...
@@ -424,7 +424,7 @@ dragonfly*)
424 424
 openbsd*)
425 425
     if test "$have_pthreads" = "yes"; then
426 426
 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
427
-	if test "$disable_cr" = "yes"; then
427
+	if test "$use_cr" = "no"; then
428 428
 	    CLAMD_LIBS="$CLAMD_LIBS -pthread"
429 429
 	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
430 430
 	else