git-svn: trunk@2907
Tomasz Kojm authored on 2007/03/06 05:21:56... | ... |
@@ -1494,6 +1494,7 @@ Optional Features: |
1494 | 1494 |
--enable-fast-install[=PKGS] |
1495 | 1495 |
optimize for fast installation [default=yes] |
1496 | 1496 |
--disable-libtool-lock avoid locking (might break parallel builds) |
1497 |
+ --enable-experimental enable experimental code |
|
1497 | 1498 |
--enable-maintainer-mode enable make rules and dependencies not useful |
1498 | 1499 |
(and sometimes confusing) to the casual installer |
1499 | 1500 |
--disable-zlib-vcheck do not check for buggy zlib version |
... | ... |
@@ -1512,7 +1513,6 @@ Optional Features: |
1512 | 1512 |
--enable-debug enable debug code |
1513 | 1513 |
--enable-no-cache use "Cache-Control: no-cache" in freshclam |
1514 | 1514 |
--enable-dns-fix enable workaround for broken DNS servers (as in SpeedTouch 510) |
1515 |
- --enable-experimental enable experimental code |
|
1516 | 1515 |
--enable-bigstack increase thread stack size |
1517 | 1516 |
--disable-gethostbyname_r disable support for gethostbyname_r |
1518 | 1517 |
--enable-readdir_r enable support for readdir_r |
... | ... |
@@ -20346,6 +20346,22 @@ _ACEOF |
20346 | 20346 |
|
20347 | 20347 |
|
20348 | 20348 |
|
20349 |
+# Check whether --enable-experimental was given. |
|
20350 |
+if test "${enable_experimental+set}" = set; then |
|
20351 |
+ enableval=$enable_experimental; enable_experimental=$enableval |
|
20352 |
+else |
|
20353 |
+ enable_experimental="no" |
|
20354 |
+fi |
|
20355 |
+ |
|
20356 |
+ |
|
20357 |
+if test "$enable_experimental" = "yes"; then |
|
20358 |
+ |
|
20359 |
+cat >>confdefs.h <<\_ACEOF |
|
20360 |
+#define CL_EXPERIMENTAL 1 |
|
20361 |
+_ACEOF |
|
20362 |
+ |
|
20363 |
+fi |
|
20364 |
+ |
|
20349 | 20365 |
{ echo "$as_me:$LINENO: checking for bind in -lsocket" >&5 |
20350 | 20366 |
echo $ECHO_N "checking for bind in -lsocket... $ECHO_C" >&6; } |
20351 | 20367 |
if test "${ac_cv_lib_socket_bind+set}" = set; then |
... | ... |
@@ -22616,7 +22632,7 @@ else |
22616 | 22616 |
fi |
22617 | 22617 |
|
22618 | 22618 |
|
22619 |
-if test "$lcurl" != "no" |
|
22619 |
+if test "$lcurl" != "no" -a "$enable_experimental" != "yes" |
|
22620 | 22620 |
then |
22621 | 22621 |
my_cv_curl_vers=NONE |
22622 | 22622 |
check="7.10.0" |
... | ... |
@@ -22772,22 +22788,6 @@ _ACEOF |
22772 | 22772 |
|
22773 | 22773 |
fi |
22774 | 22774 |
|
22775 |
-# Check whether --enable-experimental was given. |
|
22776 |
-if test "${enable_experimental+set}" = set; then |
|
22777 |
- enableval=$enable_experimental; enable_experimental=$enableval |
|
22778 |
-else |
|
22779 |
- enable_experimental="no" |
|
22780 |
-fi |
|
22781 |
- |
|
22782 |
- |
|
22783 |
-if test "$enable_experimental" = "yes"; then |
|
22784 |
- |
|
22785 |
-cat >>confdefs.h <<\_ACEOF |
|
22786 |
-#define CL_EXPERIMENTAL 1 |
|
22787 |
-_ACEOF |
|
22788 |
- |
|
22789 |
-fi |
|
22790 |
- |
|
22791 | 22775 |
# Check whether --enable-bigstack was given. |
22792 | 22776 |
if test "${enable_bigstack+set}" = set; then |
22793 | 22777 |
enableval=$enable_bigstack; enable_bigstack=$enableval |
... | ... |
@@ -49,6 +49,14 @@ AC_COMPILE_CHECK_SIZEOF(int) |
49 | 49 |
AC_COMPILE_CHECK_SIZEOF(long) |
50 | 50 |
AC_COMPILE_CHECK_SIZEOF(long long) |
51 | 51 |
|
52 |
+AC_ARG_ENABLE(experimental, |
|
53 |
+[ --enable-experimental enable experimental code], |
|
54 |
+enable_experimental=$enableval, enable_experimental="no") |
|
55 |
+ |
|
56 |
+if test "$enable_experimental" = "yes"; then |
|
57 |
+ AC_DEFINE(CL_EXPERIMENTAL,1,[enable experimental code]) |
|
58 |
+fi |
|
59 |
+ |
|
52 | 60 |
AC_CHECK_LIB(socket, bind, [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"]) |
53 | 61 |
AC_CHECK_LIB(nsl, gethostent, [LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl"]) |
54 | 62 |
|
... | ... |
@@ -226,7 +234,7 @@ AC_ARG_WITH(libcurl, |
226 | 226 |
[ lcurl=auto ]) |
227 | 227 |
|
228 | 228 |
dnl Based on http://curl.signal42.com/libcurl/using/autoconf.html |
229 |
-if test "$lcurl" != "no" |
|
229 |
+if test "$lcurl" != "no" -a "$enable_experimental" != "yes" |
|
230 | 230 |
then |
231 | 231 |
my_cv_curl_vers=NONE |
232 | 232 |
dnl check is the plain-text version of the required version |
... | ... |
@@ -316,14 +324,6 @@ if test "$enable_dnsfix" = "yes"; then |
316 | 316 |
AC_DEFINE(FRESHCLAM_DNS_FIX,1,[enable workaround for broken DNS servers]) |
317 | 317 |
fi |
318 | 318 |
|
319 |
-AC_ARG_ENABLE(experimental, |
|
320 |
-[ --enable-experimental enable experimental code], |
|
321 |
-enable_experimental=$enableval, enable_experimental="no") |
|
322 |
- |
|
323 |
-if test "$enable_experimental" = "yes"; then |
|
324 |
- AC_DEFINE(CL_EXPERIMENTAL,1,[enable experimental code]) |
|
325 |
-fi |
|
326 |
- |
|
327 | 319 |
AC_ARG_ENABLE(bigstack, |
328 | 320 |
[ --enable-bigstack increase thread stack size], |
329 | 321 |
enable_bigstack=$enableval, enable_bigstack="no") |