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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@@ -513,7 +513,7 @@ uninstall-pkgconfigDATA:

 #     (which will cause the Makefiles to be regenerated when you run `make');

 # (2) otherwise, pass the desired values on the `make' command line.

 $(RECURSIVE_TARGETS):

-	@failcom='exit 1'; \

+	@fail= failcom='exit 1'; \

 	for f in x $$MAKEFLAGS; do \

 	  case $$f in \

 	    *=* | --[!k]*);; \

@@ -538,7 +538,7 @@ $(RECURSIVE_TARGETS):

 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):

-	@failcom='exit 1'; \

+	@fail= failcom='exit 1'; \

 	for f in x $$MAKEFLAGS; do \

 	  case $$f in \

 	    *=* | --[!k]*);; \

@@ -702,7 +702,8 @@ distdir: $(DISTFILES)

 	  fi; \

 	done

 	-test -n "$(am__skip_mode_fix)" \

-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \

+	|| find "$(distdir)" -type d ! -perm -755 \

+		-exec chmod u+rwx,go+rx {} \; -o \

 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \

 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \

 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \

@@ -746,17 +747,17 @@ dist dist-all: distdir

 distcheck: dist

 	case '$(DIST_ARCHIVES)' in \

 	*.tar.gz*) \

-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\

+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\

 	*.tar.bz2*) \

-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\

+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\

 	*.tar.lzma*) \

-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\

+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\

 	*.tar.xz*) \

 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\

 	*.tar.Z*) \

 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\

 	*.shar.gz*) \

-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\

+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\

 	*.zip*) \

 	  unzip $(distdir).zip ;;\

 	esac

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

-# generated automatically by aclocal 1.11 -*- Autoconf -*-

+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.

@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],

 [am__api_version='1.11'

 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

 dnl require some minimum version.  Point them to the right macro.

-m4_if([$1], [1.11], [],

+m4_if([$1], [1.11.1], [],

       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

 ])

@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])

 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.11])dnl

+[AM_AUTOMAKE_VERSION([1.11.1])dnl

 m4_ifndef([AC_AUTOCONF_VERSION],

   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@@ -54,6 +54,7 @@ build_triplet = @build@

 host_triplet = @host@

 target_triplet = @target@

 @BUILD_CLAMD_TRUE@bin_PROGRAMS = clamdscan$(EXEEXT)

+@BUILD_CLAMD_TRUE@@VERSIONSCRIPT_TRUE@am__append_1 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/clamdscan/clamdscan.map

 subdir = clamdscan

 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

@@ -79,14 +80,13 @@ am__clamdscan_SOURCES_DIST = $(top_srcdir)/shared/output.c \

 	$(top_srcdir)/shared/optparser.h $(top_srcdir)/shared/misc.c \

 	$(top_srcdir)/shared/misc.h $(top_srcdir)/shared/getopt.c \

 	$(top_srcdir)/shared/getopt.h $(top_srcdir)/shared/actions.c \

-	$(top_srcdir)/shared/actions.h \

-	$(top_srcdir)/libclamav/regex/strlcpy.c clamdscan.c proto.c \

-	proto.h client.c client.h

+	$(top_srcdir)/shared/actions.h clamdscan.c proto.c proto.h \

+	client.c client.h

 @BUILD_CLAMD_TRUE@am_clamdscan_OBJECTS = output.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	optparser.$(OBJEXT) misc.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	getopt.$(OBJEXT) actions.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	strlcpy.$(OBJEXT) clamdscan.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	proto.$(OBJEXT) client.$(OBJEXT)

+@BUILD_CLAMD_TRUE@	clamdscan.$(OBJEXT) proto.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	client.$(OBJEXT)

 clamdscan_OBJECTS = $(am_clamdscan_OBJECTS)

 clamdscan_LDADD = $(LDADD)

 AM_V_lt = $(am__v_lt_$(V))

@@ -172,7 +172,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCOV = @LCOV@

 LD = @LD@

-LDFLAGS = @LDFLAGS@

+LDFLAGS = @LDFLAGS@ $(am__append_1)

 LIBADD_DL = @LIBADD_DL@

 LIBADD_DLD_LINK = @LIBADD_DLD_LINK@

 LIBADD_DLOPEN = @LIBADD_DLOPEN@

@@ -293,7 +293,6 @@ top_srcdir = @top_srcdir@

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/getopt.h \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/actions.c \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/actions.h \

-@BUILD_CLAMD_TRUE@    $(top_srcdir)/libclamav/regex/strlcpy.c\

 @BUILD_CLAMD_TRUE@    clamdscan.c \

 @BUILD_CLAMD_TRUE@    proto.c \

 @BUILD_CLAMD_TRUE@    proto.h \

@@ -414,7 +413,6 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proto.Po@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Po@am__quote@

 .c.o:

 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

@@ -520,22 +518,6 @@ actions.obj: $(top_srcdir)/shared/actions.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o actions.obj `if test -f '$(top_srcdir)/shared/actions.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/actions.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/actions.c'; fi`

-strlcpy.o: $(top_srcdir)/libclamav/regex/strlcpy.c

-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strlcpy.o -MD -MP -MF $(DEPDIR)/strlcpy.Tpo -c -o strlcpy.o `test -f '$(top_srcdir)/libclamav/regex/strlcpy.c' || echo '$(srcdir)/'`$(top_srcdir)/libclamav/regex/strlcpy.c

-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/strlcpy.Tpo $(DEPDIR)/strlcpy.Po

-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/libclamav/regex/strlcpy.c' object='strlcpy.o' libtool=no @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strlcpy.o `test -f '$(top_srcdir)/libclamav/regex/strlcpy.c' || echo '$(srcdir)/'`$(top_srcdir)/libclamav/regex/strlcpy.c

-

-strlcpy.obj: $(top_srcdir)/libclamav/regex/strlcpy.c

-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strlcpy.obj -MD -MP -MF $(DEPDIR)/strlcpy.Tpo -c -o strlcpy.obj `if test -f '$(top_srcdir)/libclamav/regex/strlcpy.c'; then $(CYGPATH_W) '$(top_srcdir)/libclamav/regex/strlcpy.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/libclamav/regex/strlcpy.c'; fi`

-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/strlcpy.Tpo $(DEPDIR)/strlcpy.Po

-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/libclamav/regex/strlcpy.c' object='strlcpy.obj' libtool=no @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strlcpy.obj `if test -f '$(top_srcdir)/libclamav/regex/strlcpy.c'; then $(CYGPATH_W) '$(top_srcdir)/libclamav/regex/strlcpy.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/libclamav/regex/strlcpy.c'; fi`

-

 mostlyclean-libtool:

 	-rm -f *.lo

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@@ -11173,6 +11173,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

 LIBADD_DLOPEN=

+lt_save_LIBS="$LIBS"

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5

 $as_echo_n "checking for library containing dlopen... " >&6; }

 if test "${ac_cv_search_dlopen+set}" = set; then :

@@ -11307,7 +11308,6 @@ fi

 if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes

 then

-  lt_save_LIBS="$LIBS"

   LIBS="$LIBS $LIBADD_DLOPEN"

   for ac_func in dlerror

 do :

@@ -11320,8 +11320,8 @@ _ACEOF

 fi

 done

-  LIBS="$lt_save_LIBS"

 fi

+LIBS="$lt_save_LIBS"

 LIBADD_SHL_LOAD=

@@ -14968,10 +14968,10 @@ $as_echo "$as_me: WARNING: ****** stability problems to the ClamAV developers!"

 	fi

     fi

+    save_LIBS="$LIBS"

     if test "$ZLIB_HOME" != "/usr"; then

 	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"

 	save_LDFLAGS="$LDFLAGS"

-	save_LIBS="$LIBS"

 	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"

 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5

 $as_echo_n "checking for inflateEnd in -lz... " >&6; }

@@ -15010,7 +15010,7 @@ fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateEnd" >&5

 $as_echo "$ac_cv_lib_z_inflateEnd" >&6; }

 if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then :

-  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"

+  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"

 else

   as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5

 fi

@@ -15063,7 +15063,6 @@ else

 fi

 	LDFLAGS="$save_LDFLAGS"

-	LIBS="$save_LIBS"

     else

 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5

 $as_echo_n "checking for inflateEnd in -lz... " >&6; }

@@ -15102,7 +15101,7 @@ fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateEnd" >&5

 $as_echo "$ac_cv_lib_z_inflateEnd" >&6; }

 if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then :

-  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"

+  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"

 else

   as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5

 fi

@@ -15155,6 +15154,7 @@ else

 fi

     fi

+    LIBS="$save_LIBS"

 fi

 # Check whether --enable-bzip2 was given.

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@@ -1928,7 +1928,7 @@ uninstall-includeHEADERS:

 #     (which will cause the Makefiles to be regenerated when you run `make');

 # (2) otherwise, pass the desired values on the `make' command line.

 $(RECURSIVE_TARGETS):

-	@failcom='exit 1'; \

+	@fail= failcom='exit 1'; \

 	for f in x $$MAKEFLAGS; do \

 	  case $$f in \

 	    *=* | --[!k]*);; \

@@ -1953,7 +1953,7 @@ $(RECURSIVE_TARGETS):

 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):

-	@failcom='exit 1'; \

+	@fail= failcom='exit 1'; \

 	for f in x $$MAKEFLAGS; do \

 	  case $$f in \

 	    *=* | --[!k]*);; \

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@@ -6174,7 +6174,8 @@ distdir: $(DISTFILES)

 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \

 	  dist-hook

 	-test -n "$(am__skip_mode_fix)" \

-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \

+	|| find "$(distdir)" -type d ! -perm -755 \

+		-exec chmod u+rwx,go+rx {} \; -o \

 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \

 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \

 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \

@@ -6218,17 +6219,17 @@ dist dist-all: distdir

 distcheck: dist

 	case '$(DIST_ARCHIVES)' in \

 	*.tar.gz*) \

-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\

+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\

 	*.tar.bz2*) \

-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\

+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\

 	*.tar.lzma*) \

-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\

+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\

 	*.tar.xz*) \

 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\

 	*.tar.Z*) \

 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\

 	*.shar.gz*) \

-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\

+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\

 	*.zip*) \

 	  unzip $(distdir).zip ;;\

 	esac

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

-# generated automatically by aclocal 1.11 -*- Autoconf -*-

+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.

@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],

 [am__api_version='1.11'

 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

 dnl require some minimum version.  Point them to the right macro.

-m4_if([$1], [1.11], [],

+m4_if([$1], [1.11.1], [],

       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

 ])

@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])

 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.11])dnl

+[AM_AUTOMAKE_VERSION([1.11.1])dnl

 m4_ifndef([AC_AUTOCONF_VERSION],

   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

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

-# Makefile.in generated by automake 1.11 from Makefile.am.

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@@ -847,10 +847,11 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)

 check-TESTS:

 	@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list

 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)

-	@set_logs=; if test "X$(TEST_LOGS)" = X.log; then		\

-	  set_logs=TEST_LOGS=;						\

-	fi;								\

-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) $$set_logs

+	@list='$(TEST_LOGS)';						\

+	list=`for f in $$list; do					\

+	  test .log = $$f || echo $$f;					\

+	done | tr '\012\015' '  '`;					\

+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"

 .log.html:

 	@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';		\