git-svn: trunk@1615
Tomasz Kojm authored on 2005/06/14 07:41:54... | ... |
@@ -10327,11 +10327,12 @@ echo "${ECHO_T}$ZLIB_HOME" >&6 |
10327 | 10327 |
|
10328 | 10328 |
fi; |
10329 | 10329 |
|
10330 |
-zlib_check="yes" |
|
10331 | 10330 |
# Check whether --enable-zlib-vcheck or --disable-zlib-vcheck was given. |
10332 | 10331 |
if test "${enable_zlib_vcheck+set}" = set; then |
10333 | 10332 |
enableval="$enable_zlib_vcheck" |
10334 |
- zlib_check="no" |
|
10333 |
+ zlib_check=$enableval |
|
10334 |
+else |
|
10335 |
+ zlib_check="yes" |
|
10335 | 10336 |
fi; |
10336 | 10337 |
|
10337 | 10338 |
if test ! -f "$ZLIB_HOME/include/zlib.h" |
... | ... |
@@ -10518,11 +10519,12 @@ fi |
10518 | 10518 |
fi |
10519 | 10519 |
fi |
10520 | 10520 |
|
10521 |
-want_bzip2="yes" |
|
10522 | 10521 |
# Check whether --enable-bzip2 or --disable-bzip2 was given. |
10523 | 10522 |
if test "${enable_bzip2+set}" = set; then |
10524 | 10523 |
enableval="$enable_bzip2" |
10525 |
- want_bzip2="no" |
|
10524 |
+ want_bzip2=$enableval |
|
10525 |
+else |
|
10526 |
+ want_bzip2="yes" |
|
10526 | 10527 |
fi; |
10527 | 10528 |
|
10528 | 10529 |
if test "$want_bzip2" = "yes" |
... | ... |
@@ -11043,11 +11045,12 @@ fi |
11043 | 11043 |
|
11044 | 11044 |
fi |
11045 | 11045 |
|
11046 |
-want_clamuko="yes" |
|
11047 | 11046 |
# Check whether --enable-clamuko or --disable-clamuko was given. |
11048 | 11047 |
if test "${enable_clamuko+set}" = set; then |
11049 | 11048 |
enableval="$enable_clamuko" |
11050 |
- want_clamuko="no" |
|
11049 |
+ want_clamuko=$enableval |
|
11050 |
+else |
|
11051 |
+ want_clamuko="yes" |
|
11051 | 11052 |
fi; |
11052 | 11053 |
|
11053 | 11054 |
echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5 |
... | ... |
@@ -11207,11 +11210,12 @@ _ACEOF |
11207 | 11207 |
|
11208 | 11208 |
fi |
11209 | 11209 |
|
11210 |
-want_dsig="yes" |
|
11211 | 11210 |
# Check whether --enable-dsig or --disable-dsig was given. |
11212 | 11211 |
if test "${enable_dsig+set}" = set; then |
11213 | 11212 |
enableval="$enable_dsig" |
11214 |
- want_dsig="no" |
|
11213 |
+ want_dsig=$enableval |
|
11214 |
+else |
|
11215 |
+ want_dsig="yes" |
|
11215 | 11216 |
fi; |
11216 | 11217 |
|
11217 | 11218 |
if test "$want_dsig" = "yes" |
... | ... |
@@ -11420,19 +11424,19 @@ fi |
11420 | 11420 |
# Check whether --enable-pthreads or --disable-pthreads was given. |
11421 | 11421 |
if test "${enable_pthreads+set}" = set; then |
11422 | 11422 |
enableval="$enable_pthreads" |
11423 |
- have_pthreads=no |
|
11423 |
+ have_pthreads=$enableval |
|
11424 | 11424 |
fi; |
11425 | 11425 |
|
11426 | 11426 |
# Check whether --enable-cr or --disable-cr was given. |
11427 | 11427 |
if test "${enable_cr+set}" = set; then |
11428 | 11428 |
enableval="$enable_cr" |
11429 |
- disable_cr=yes |
|
11429 |
+ disable_cr=$enableval |
|
11430 | 11430 |
fi; |
11431 | 11431 |
|
11432 | 11432 |
# Check whether --enable-id-check or --disable-id-check was given. |
11433 | 11433 |
if test "${enable_id_check+set}" = set; then |
11434 | 11434 |
enableval="$enable_id_check" |
11435 |
- use_id="yes" |
|
11435 |
+ use_id=$enableval |
|
11436 | 11436 |
else |
11437 | 11437 |
use_id="no" |
11438 | 11438 |
fi; |
... | ... |
@@ -11440,7 +11444,7 @@ fi; |
11440 | 11440 |
# Check whether --enable-yp-check or --disable-yp-check was given. |
11441 | 11441 |
if test "${enable_yp_check+set}" = set; then |
11442 | 11442 |
enableval="$enable_yp_check" |
11443 |
- use_yp="yes" |
|
11443 |
+ use_yp=$enableval |
|
11444 | 11444 |
else |
11445 | 11445 |
use_yp="no" |
11446 | 11446 |
fi; |
... | ... |
@@ -11474,32 +11478,45 @@ cat >>confdefs.h <<_ACEOF |
11474 | 11474 |
_ACEOF |
11475 | 11475 |
|
11476 | 11476 |
|
11477 |
-test_clamav=yes |
|
11478 | 11477 |
# Check whether --enable-clamav or --disable-clamav was given. |
11479 | 11478 |
if test "${enable_clamav+set}" = set; then |
11480 | 11479 |
enableval="$enable_clamav" |
11481 |
- test_clamav=no |
|
11480 |
+ test_clamav=$enableval |
|
11481 |
+else |
|
11482 |
+ test_clamav=yes |
|
11482 | 11483 |
fi; |
11483 | 11484 |
|
11484 | 11485 |
# Check whether --enable-debug or --disable-debug was given. |
11485 | 11486 |
if test "${enable_debug+set}" = set; then |
11486 | 11487 |
enableval="$enable_debug" |
11488 |
+ enable_debug=$enableval |
|
11489 |
+else |
|
11490 |
+ enable_debug="no" |
|
11491 |
+fi; |
|
11492 |
+ |
|
11493 |
+if test "$enable_debug" = "yes"; then |
|
11487 | 11494 |
|
11488 | 11495 |
cat >>confdefs.h <<\_ACEOF |
11489 | 11496 |
#define CL_DEBUG 1 |
11490 | 11497 |
_ACEOF |
11491 | 11498 |
|
11492 |
-fi; |
|
11499 |
+fi |
|
11493 | 11500 |
|
11494 | 11501 |
# Check whether --enable-bigstack or --disable-bigstack was given. |
11495 | 11502 |
if test "${enable_bigstack+set}" = set; then |
11496 | 11503 |
enableval="$enable_bigstack" |
11504 |
+ enable_bigstack=$enableval |
|
11505 |
+else |
|
11506 |
+ enable_bigstack="no" |
|
11507 |
+fi; |
|
11508 |
+ |
|
11509 |
+if test "$enable_bigstack" = "yes"; then |
|
11497 | 11510 |
|
11498 | 11511 |
cat >>confdefs.h <<\_ACEOF |
11499 | 11512 |
#define C_BIGSTACK 1 |
11500 | 11513 |
_ACEOF |
11501 | 11514 |
|
11502 |
-fi; |
|
11515 |
+fi |
|
11503 | 11516 |
|
11504 | 11517 |
|
11505 | 11518 |
# Check whether --with-dbdir or --without-dbdir was given. |
... | ... |
@@ -13248,7 +13265,7 @@ fi |
13248 | 13248 |
# Check whether --enable-gethostbyname_r or --disable-gethostbyname_r was given. |
13249 | 13249 |
if test "${enable_gethostbyname_r+set}" = set; then |
13250 | 13250 |
enableval="$enable_gethostbyname_r" |
13251 |
- disable_gethostbyname_r="yes" |
|
13251 |
+ disable_gethostbyname_r=$enableval |
|
13252 | 13252 |
fi; |
13253 | 13253 |
|
13254 | 13254 |
if test "$disable_gethostbyname_r" = "yes"; then |
... | ... |
@@ -13393,12 +13410,12 @@ fi |
13393 | 13393 |
# Check whether --enable-readdir_r or --disable-readdir_r was given. |
13394 | 13394 |
if test "${enable_readdir_r+set}" = set; then |
13395 | 13395 |
enableval="$enable_readdir_r" |
13396 |
- |
|
13396 |
+ enable_readdir_r=$enableval |
|
13397 | 13397 |
else |
13398 |
- disable_readdir_r="yes" |
|
13398 |
+ enable_readdir_r="no" |
|
13399 | 13399 |
fi; |
13400 | 13400 |
|
13401 |
-if test "$disable_readdir_r" = "yes"; then |
|
13401 |
+if test "$enable_readdir_r" = "no"; then |
|
13402 | 13402 |
echo "$as_me:$LINENO: result: support disabled" >&5 |
13403 | 13403 |
echo "${ECHO_T}support disabled" >&6 |
13404 | 13404 |
elif test -z "$ac_cv_readdir_args"; then |
... | ... |
@@ -94,10 +94,9 @@ fi |
94 | 94 |
AC_MSG_RESULT($ZLIB_HOME) |
95 | 95 |
]) |
96 | 96 |
|
97 |
-zlib_check="yes" |
|
98 | 97 |
AC_ARG_ENABLE(zlib-vcheck, |
99 | 98 |
[ --disable-zlib-vcheck do not check for buggy zlib version ], |
100 |
-zlib_check="no",) |
|
99 |
+zlib_check=$enableval, zlib_check="yes") |
|
101 | 100 |
|
102 | 101 |
if test ! -f "$ZLIB_HOME/include/zlib.h" |
103 | 102 |
then |
... | ... |
@@ -128,10 +127,9 @@ else |
128 | 128 |
fi |
129 | 129 |
fi |
130 | 130 |
|
131 |
-want_bzip2="yes" |
|
132 | 131 |
AC_ARG_ENABLE(bzip2, |
133 | 132 |
[ --disable-bzip2 disable bzip2 support], |
134 |
-want_bzip2="no",) |
|
133 |
+want_bzip2=$enableval, want_bzip2="yes") |
|
135 | 134 |
|
136 | 135 |
if test "$want_bzip2" = "yes" |
137 | 136 |
then |
... | ... |
@@ -151,16 +149,15 @@ if test $want_dns = yes; then |
151 | 151 |
AC_CHECK_HEADER(resolv.h,[FRESHCLAM_LIBS="$FRESHCLAM_LIBS $resolv_lib"; AC_DEFINE(HAVE_RESOLV_H,1,have resolv.h)], AC_MSG_WARN([****** DNS support disabled])) |
152 | 152 |
fi |
153 | 153 |
|
154 |
-want_clamuko="yes" |
|
155 | 154 |
AC_ARG_ENABLE(clamuko, |
156 | 155 |
[ --disable-clamuko disable clamuko support (Linux and FreeBSD only)], |
157 |
-want_clamuko="no",) |
|
156 |
+want_clamuko=$enableval, want_clamuko="yes") |
|
158 | 157 |
|
159 | 158 |
AC_FUNC_SETPGRP |
160 | 159 |
|
161 | 160 |
AC_ARG_ENABLE(milter, |
162 | 161 |
[ --enable-milter build clamav-milter], |
163 |
-have_milter=$enableval,have_milter="no") |
|
162 |
+have_milter=$enableval, have_milter="no") |
|
164 | 163 |
|
165 | 164 |
if test "$have_milter" = "yes"; then |
166 | 165 |
sendmailprog=no |
... | ... |
@@ -185,10 +182,9 @@ if test "$have_milter" = "yes"; then |
185 | 185 |
|
186 | 186 |
fi |
187 | 187 |
|
188 |
-want_dsig="yes" |
|
189 | 188 |
AC_ARG_ENABLE(dsig, |
190 | 189 |
[ --disable-dsig disable support for digital signatures], |
191 |
-want_dsig="no",) |
|
190 |
+want_dsig=$enableval, want_dsig="yes") |
|
192 | 191 |
|
193 | 192 |
if test "$want_dsig" = "yes" |
194 | 193 |
then |
... | ... |
@@ -238,19 +234,19 @@ fi |
238 | 238 |
|
239 | 239 |
AC_ARG_ENABLE(pthreads, |
240 | 240 |
[ --disable-pthreads disable POSIX threads support], |
241 |
-have_pthreads=no, ) |
|
241 |
+have_pthreads=$enableval,) |
|
242 | 242 |
|
243 | 243 |
AC_ARG_ENABLE(cr, |
244 | 244 |
[ --disable-cr don't link with C reentrant library (BSD) ], |
245 |
-disable_cr=yes,) |
|
245 |
+disable_cr=$enableval,) |
|
246 | 246 |
|
247 | 247 |
AC_ARG_ENABLE(id-check, |
248 | 248 |
[ --enable-id-check use id utility instead of /etc/passwd parsing], |
249 |
-use_id="yes", use_id="no") |
|
249 |
+use_id=$enableval, use_id="no") |
|
250 | 250 |
|
251 | 251 |
AC_ARG_ENABLE(yp-check, |
252 | 252 |
[ --enable-yp-check use ypmatch utility instead of /etc/passwd parsing], |
253 |
-use_yp="yes", use_yp="no") |
|
253 |
+use_yp=$enableval, use_yp="no") |
|
254 | 254 |
|
255 | 255 |
AC_ARG_WITH(user, |
256 | 256 |
[ --with-user=uid name of the clamav user (default=clamav)], |
... | ... |
@@ -263,18 +259,25 @@ clamav_group="$withval", clamav_group="clamav") |
263 | 263 |
AC_DEFINE_UNQUOTED(CLAMAVUSER,"$clamav_user",[name of the clamav user]) |
264 | 264 |
AC_DEFINE_UNQUOTED(CLAMAVGROUP,"$clamav_group",[name of the clamav group]) |
265 | 265 |
|
266 |
-test_clamav=yes |
|
267 | 266 |
AC_ARG_ENABLE(clamav, |
268 | 267 |
[ --disable-clamav disable test for clamav user/group], |
269 |
-test_clamav=no,) |
|
268 |
+test_clamav=$enableval, test_clamav=yes) |
|
270 | 269 |
|
271 | 270 |
AC_ARG_ENABLE(debug, |
272 | 271 |
[ --enable-debug enable debug code], |
273 |
-AC_DEFINE(CL_DEBUG,1,[enable debugging]),) |
|
272 |
+enable_debug=$enableval, enable_debug="no") |
|
273 |
+ |
|
274 |
+if test "$enable_debug" = "yes"; then |
|
275 |
+ AC_DEFINE(CL_DEBUG,1,[enable debugging]) |
|
276 |
+fi |
|
274 | 277 |
|
275 | 278 |
AC_ARG_ENABLE(bigstack, |
276 | 279 |
[ --enable-bigstack increase thread stack size], |
277 |
-AC_DEFINE(C_BIGSTACK,1,[Increase thread stack size.]),) |
|
280 |
+enable_bigstack=$enableval, enable_bigstack="no") |
|
281 |
+ |
|
282 |
+if test "$enable_bigstack" = "yes"; then |
|
283 |
+ AC_DEFINE(C_BIGSTACK,1,[Increase thread stack size.]) |
|
284 |
+fi |
|
278 | 285 |
|
279 | 286 |
AC_ARG_WITH(dbdir, |
280 | 287 |
[ --with-dbdir=path path to virus database directory], |
... | ... |
@@ -729,7 +732,7 @@ fi |
729 | 729 |
|
730 | 730 |
AC_ARG_ENABLE(gethostbyname_r, |
731 | 731 |
[ --disable-gethostbyname_r disable support for gethostbyname_r], |
732 |
-disable_gethostbyname_r="yes", ) |
|
732 |
+disable_gethostbyname_r=$enableval,) |
|
733 | 733 |
|
734 | 734 |
if test "$disable_gethostbyname_r" = "yes"; then |
735 | 735 |
AC_MSG_RESULT(support disabled) |
... | ... |
@@ -777,10 +780,10 @@ if test -z "$ac_cv_readdir_args"; then |
777 | 777 |
fi |
778 | 778 |
|
779 | 779 |
AC_ARG_ENABLE(readdir_r, |
780 |
-[ --enable-readdir_r enable support for readdir_r],, |
|
781 |
-disable_readdir_r="yes") |
|
780 |
+[ --enable-readdir_r enable support for readdir_r], |
|
781 |
+enable_readdir_r=$enableval, enable_readdir_r="no") |
|
782 | 782 |
|
783 |
-if test "$disable_readdir_r" = "yes"; then |
|
783 |
+if test "$enable_readdir_r" = "no"; then |
|
784 | 784 |
AC_MSG_RESULT(support disabled) |
785 | 785 |
elif test -z "$ac_cv_readdir_args"; then |
786 | 786 |
AC_MSG_RESULT(no) |