|
Lines 1-61
Link Here
|
| 1 |
--- clamav-devel.orig/files/patch-configure.in Thu Jan 1 01:00:00 1970 |
1 |
--- configure.in.orig Wed Jul 28 21:50:07 2004 |
| 2 |
+++ clamav-devel/files/patch-configure.in Sun Feb 29 20:35:49 2004 |
2 |
+++ configure.in Wed Aug 11 19:03:36 2004 |
| 3 |
@@ -0,0 +1,58 @@ |
3 |
@@ -247,10 +247,37 @@ |
| 4 |
+--- configure.in.orig Mon Feb 23 18:24:52 2004 |
4 |
;; |
| 5 |
++++ configure.in Wed Feb 25 17:39:15 2004 |
5 |
freebsd*) |
| 6 |
+@@ -199,9 +199,9 @@ |
6 |
if test "$have_pthreads" = "yes"; then |
| 7 |
+ AC_SUBST(CFGDIR) |
7 |
- LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r" |
| 8 |
+ AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file]) |
8 |
- CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r" |
| 9 |
+ |
9 |
- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r" |
| 10 |
+-dnl Do not overwrite the current config file |
10 |
- TH_SAFE="-thread-safe" |
| 11 |
+-AM_CONDITIONAL(INSTALL_CLAMAV_CONF, test ! -r "$cfg_dir/clamav.conf") |
11 |
+ if test -n "$with_os_version"; then |
| 12 |
+-AM_CONDITIONAL(INSTALL_FRESHCLAM_CONF, test ! -r "$cfg_dir/freshclam.conf") |
12 |
+ OSVERSION="$with_os_version" |
| 13 |
++dnl Do not install config files |
13 |
+ else |
| 14 |
++AM_CONDITIONAL(INSTALL_CLAMAV_CONF, test 0 = 1 ) |
14 |
+ OSVERSION=`/sbin/sysctl -n kern.osreldate` |
| 15 |
++AM_CONDITIONAL(INSTALL_FRESHCLAM_CONF, test 0 = 1 ) |
15 |
+ fi |
| 16 |
+ |
16 |
+ if test -z "$PTHREAD_CFLAGS"; then |
| 17 |
+ if test "$test_urandom" = "yes" |
17 |
+ if test "$OSVERSION" -lt "502102"; then |
| 18 |
+ then |
18 |
+ PTHREAD_CFLAGS="-D_THREAD_SAFE" |
| 19 |
+@@ -294,10 +294,38 @@ |
19 |
+ else |
| 20 |
+ ;; |
20 |
+ unset PTHREAD_CFLAGS |
| 21 |
+ freebsd*) |
21 |
+ fi |
| 22 |
+ if test "$have_pthreads" = "yes"; then |
22 |
+ fi |
| 23 |
+- LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r" |
23 |
+ if test -z "$PTHREAD_LIBS"; then |
| 24 |
+- CLAMD_LIBS="-pthread -lc_r" |
24 |
+ if test "$OSVERSION" -lt "502102"; then |
| 25 |
+- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r" |
25 |
+ PTHREAD_LIBS="-lc_r" |
| 26 |
+- TH_SAFE="-thread-safe" |
26 |
+ fi |
| 27 |
++ if test -n "$with_os_version"; then |
27 |
+ if test "$OSVERSION" -lt "500016"; then |
| 28 |
++ OSVERSION="$with_os_version" |
28 |
+ PTHREAD_LIBS="-pthread" |
| 29 |
++ else |
29 |
+ fi |
| 30 |
++ OSVERSION=`/sbin/sysctl -n kern.osreldate` |
30 |
+ if test "$OSVERSION" -ge "502102"; then |
| 31 |
++ fi |
31 |
+ PTHREAD_LIBS="-lpthread" |
| 32 |
++ if test -z "$PTHREAD_CFLAGS"; then |
32 |
+ fi |
| 33 |
++ if test "$OSVERSION" -lt "502102"; then |
33 |
+ fi |
| 34 |
++ PTHREAD_CFLAGS="-D_THREAD_SAFE" |
34 |
+ if test "$OSVERSION" -lt "500016"; then |
| 35 |
++ else |
35 |
+ PTHREAD_LIBS="$PTHREAD_LIBS -lc_r" |
| 36 |
++ unset PTHREAD_CFLAGS |
36 |
+ fi |
| 37 |
++ fi |
37 |
+ |
| 38 |
++ fi |
38 |
+ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $PTHREAD_LIBS" |
| 39 |
++ if test -z "$PTHREAD_LIBS"; then |
39 |
+ CLAMD_LIBS="$PTHREAD_LIBS" |
| 40 |
++ if test "$OSVERSION" -lt "502102"; then |
40 |
+ CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $PTHREAD_LIBS" |
| 41 |
++ PTHREAD_LIBS="-lc_r" |
41 |
+ TH_SAFE="-thread-safe $PTHREAD_CFLAGS" |
| 42 |
++ fi |
42 |
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe]) |
| 43 |
++ if test "$OSVERSION" -lt "500016"; then |
43 |
AC_DEFINE(_REENTRANT,1,[thread safe]) |
| 44 |
++ PTHREAD_LIBS="-pthread" |
44 |
if test "$want_clamuko" = "yes"; then |
| 45 |
++ fi |
45 |
@@ -476,6 +503,8 @@ |
| 46 |
++ if test "$OSVERSION" -ge "502102"; then |
46 |
|
| 47 |
++ PTHREAD_LIBS="-lpthread" |
47 |
dnl Check for gethostbyname_r and number of its arguments |
| 48 |
++ fi |
48 |
dnl Code from libwww/configure.in |
| 49 |
++ fi |
49 |
+AC_CHECK_FUNC(gethostbyname_r) |
| 50 |
++ |
50 |
+if test $ac_cv_func_gethostbyname_r = 'yes'; then |
| 51 |
++ if test "$OSVERSION" -lt "500016"; then |
51 |
AC_MSG_CHECKING(for gethostbyname_r) |
| 52 |
++ PTHREAD_LIBS="$PTHREAD_LIBS -lc_r" |
52 |
if test -z "$ac_cv_gethostbyname_args"; then |
| 53 |
++ fi |
53 |
AC_TRY_COMPILE( |
| 54 |
++ |
54 |
@@ -531,6 +560,13 @@ |
| 55 |
++ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $PTHREAD_LIBS" |
55 |
AC_DEFINE(HAVE_GETHOSTBYNAME_R_6,1,[gethostbyname_r takes 6 arguments]) |
| 56 |
++ CLAMD_LIBS="$PTHREAD_LIBS" |
56 |
fi |
| 57 |
++ CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $PTHREAD_LIBS" |
57 |
AC_MSG_RESULT([yes, and it takes $ac_cv_gethostbyname_args arguments]) |
| 58 |
++ TH_SAFE="-thread-safe $PTHREAD_CFLAGS" |
58 |
+fi |
| 59 |
+ AC_DEFINE(CL_THREAD_SAFE,1,[thread safe]) |
59 |
+else |
| 60 |
+ AC_DEFINE(_REENTRANT,1,[thread safe]) |
60 |
+dnl Check for gethostbyname() |
| 61 |
+ fi |
61 |
+AC_CHECK_FUNC(gethostbyname) |
|
|
62 |
+if test $ac_cv_func_gethostbyname = 'no'; then |
| 63 |
+ AC_MSG_ERROR(***** fail on check gethostbyname()) |
| 64 |
+fi |
| 65 |
fi |
| 66 |
|
| 67 |
dnl Check for clamav in /etc/passwd |