@@ -1,4 +1,7 @@

-Sun Oct 12 13:37:41 BST 2003 (njh)

+Sun Oct 12 19:46:18 CEST 2003 (tk)

+----------------------------------

+  * libclamav: Makefile: do not overwrite CFLAGS

+

 ----------------------------------

   * libclamav: handles Eicar found in Appledouble files, though Appledouble

   		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

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.5 2003/08/29 14:27:14 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.6 2003/10/12 17:51:08 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.5 2003/08/29 14:27:14 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.6 2003/10/12 17:51:08 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -1901,7 +1901,7 @@ fi

 # Define the identity of the package.

  PACKAGE=clamav

- VERSION=20030829

+ VERSION="devel-`date +%Y%m%d`"

 cat >>confdefs.h <<_ACEOF

@@ -9075,7 +9075,7 @@ solaris*)

     FRESHCLAM_LIBS="-lsocket -lnsl -lresolv"

     if test "$have_pthreads" = "yes"; then

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

-	CLAMD_LIBS="-lpthread -lsocket -lnsl"

+	CLAMD_LIBS="-lpthread -lsocket -lnsl -lresolv"

 	TH_SAFE="-thread-safe"

 	cat >>confdefs.h <<\_ACEOF

 #define CL_THREAD_SAFE 1

@@ -19,7 +19,7 @@ AC_INIT(clamscan/clamscan.c)

 AC_CREATE_TARGET_H(target.h)

 AC_CANONICAL_SYSTEM

-AM_INIT_AUTOMAKE(clamav, 20030829)

+AM_INIT_AUTOMAKE(clamav, "devel-`date +%Y%m%d`")

 dnl AM_INIT_AUTOMAKE(clamav, `date +%Y%m%d`)

 LC_CURRENT=1

 LC_REVISION=3

@@ -16,8 +16,6 @@

 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

-CFLAGS = -Wall -pedantic

-

 INCLUDES = -I.. -I@srcdir@/zziplib

 libclamav_la_LIBADD = @LIBCLAMAV_LIBS@

@@ -114,8 +114,6 @@ am__include = @am__include@

 am__quote = @am__quote@

 install_sh = @install_sh@

-CFLAGS = -Wall -pedantic

-

 INCLUDES = -I.. -I@srcdir@/zziplib

 libclamav_la_LIBADD = @LIBCLAMAV_LIBS@

@@ -212,6 +210,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \

 CCLD = $(CC)

 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

 	$(AM_LDFLAGS) $(LDFLAGS) -o $@

+CFLAGS = @CFLAGS@

 DIST_SOURCES = $(libclamav_la_SOURCES)

 HEADERS = $(include_HEADERS)