git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@82 77e5149b-7576-45b1-b177-96237e5ba77b
Tomasz Kojm authored on 2003/10/13 02:51:08... | ... |
@@ -1,4 +1,7 @@ |
1 |
-Sun Oct 12 13:37:41 BST 2003 (njh) |
|
1 |
+Sun Oct 12 19:46:18 CEST 2003 (tk) |
|
2 |
+---------------------------------- |
|
3 |
+ * libclamav: Makefile: do not overwrite CFLAGS |
|
4 |
+ |
|
2 | 5 |
---------------------------------- |
3 | 6 |
* libclamav: handles Eicar found in Appledouble files, though Appledouble |
4 | 7 |
files are not yet handled |
... | ... |
@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for |
81 | 81 |
dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created |
82 | 82 |
dnl (the prefix is a bit different, since we add an extra -target- and -host-) |
83 | 83 |
dnl |
84 |
-dnl @version: $Id: aclocal.m4,v 1.5 2003/08/29 14:27:14 kojm Exp $ |
|
84 |
+dnl @version: $Id: aclocal.m4,v 1.6 2003/10/12 17:51:08 kojm Exp $ |
|
85 | 85 |
dnl @author Guido Draheim <guidod@gmx.de> STATUS: used often |
86 | 86 |
|
87 | 87 |
AC_DEFUN([AC_CREATE_TARGET_H], |
... | ... |
@@ -4041,7 +4041,7 @@ dnl AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers) |
4041 | 4041 |
dnl AC_COMPILE_CHECK_SIZEOF(off_t, $headers) |
4042 | 4042 |
dnl |
4043 | 4043 |
dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu> |
4044 |
-dnl @version $Id: aclocal.m4,v 1.5 2003/08/29 14:27:14 kojm Exp $ |
|
4044 |
+dnl @version $Id: aclocal.m4,v 1.6 2003/10/12 17:51:08 kojm Exp $ |
|
4045 | 4045 |
dnl |
4046 | 4046 |
AC_DEFUN([AC_COMPILE_CHECK_SIZEOF], |
4047 | 4047 |
[changequote(<<, >>)dnl |
... | ... |
@@ -1901,7 +1901,7 @@ fi |
1901 | 1901 |
|
1902 | 1902 |
# Define the identity of the package. |
1903 | 1903 |
PACKAGE=clamav |
1904 |
- VERSION=20030829 |
|
1904 |
+ VERSION="devel-`date +%Y%m%d`" |
|
1905 | 1905 |
|
1906 | 1906 |
|
1907 | 1907 |
cat >>confdefs.h <<_ACEOF |
... | ... |
@@ -9075,7 +9075,7 @@ solaris*) |
9075 | 9075 |
FRESHCLAM_LIBS="-lsocket -lnsl -lresolv" |
9076 | 9076 |
if test "$have_pthreads" = "yes"; then |
9077 | 9077 |
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread" |
9078 |
- CLAMD_LIBS="-lpthread -lsocket -lnsl" |
|
9078 |
+ CLAMD_LIBS="-lpthread -lsocket -lnsl -lresolv" |
|
9079 | 9079 |
TH_SAFE="-thread-safe" |
9080 | 9080 |
cat >>confdefs.h <<\_ACEOF |
9081 | 9081 |
#define CL_THREAD_SAFE 1 |
... | ... |
@@ -19,7 +19,7 @@ AC_INIT(clamscan/clamscan.c) |
19 | 19 |
AC_CREATE_TARGET_H(target.h) |
20 | 20 |
AC_CANONICAL_SYSTEM |
21 | 21 |
|
22 |
-AM_INIT_AUTOMAKE(clamav, 20030829) |
|
22 |
+AM_INIT_AUTOMAKE(clamav, "devel-`date +%Y%m%d`") |
|
23 | 23 |
dnl AM_INIT_AUTOMAKE(clamav, `date +%Y%m%d`) |
24 | 24 |
LC_CURRENT=1 |
25 | 25 |
LC_REVISION=3 |
... | ... |
@@ -114,8 +114,6 @@ am__include = @am__include@ |
114 | 114 |
am__quote = @am__quote@ |
115 | 115 |
install_sh = @install_sh@ |
116 | 116 |
|
117 |
-CFLAGS = -Wall -pedantic |
|
118 |
- |
|
119 | 117 |
INCLUDES = -I.. -I@srcdir@/zziplib |
120 | 118 |
|
121 | 119 |
libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ |
... | ... |
@@ -212,6 +210,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ |
212 | 212 |
CCLD = $(CC) |
213 | 213 |
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
214 | 214 |
$(AM_LDFLAGS) $(LDFLAGS) -o $@ |
215 |
+CFLAGS = @CFLAGS@ |
|
215 | 216 |
DIST_SOURCES = $(libclamav_la_SOURCES) |
216 | 217 |
HEADERS = $(include_HEADERS) |
217 | 218 |
|