@@ -23,8 +23,6 @@ AC_PREREQ([2.59])

 dnl For a release change [devel] to the real version [0.xy]

 dnl also change VERSION below

 AC_INIT([ClamAV], [0.102.2], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/])

-dnl put configure auxiliary into config

-AC_CONFIG_AUX_DIR([config])

 dnl put configure auxiliary into config

 AC_CONFIG_AUX_DIR([config])

@@ -44,13 +42,12 @@ dnl -Wall and -Werror here are NOT CFLAGS, they refer to automake warnings

 dnl enable stealth builds and psychedelic tests

 AM_INIT_AUTOMAKE([1.11 -Wall -Wportability -Wno-override std-options foreign dist-bzip2 no-define color-tests parallel-tests tar-ustar])

 AM_SILENT_RULES([yes])

-

+AC_USE_SYSTEM_EXTENSIONS

 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])

 dnl we told automake to not define these, since we want to include

 dnl the date in the version

 AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])

-AC_USE_SYSTEM_EXTENSIONS

 m4_include([m4/reorganization/version.m4])

@@ -10,7 +10,7 @@

 if ENABLE_FUZZ

-LIB_FUZZING_ENGINE_DEPRECATED ?= standalone_fuzz_target_runner.a

+LIB_FUZZING_ENGINE_DEPRECATED ?= libstandalone_fuzz_target_runner.a

 AM_CPPFLAGS = \

     @SSL_CPPFLAGS@ \

@@ -63,8 +63,8 @@ fuzz_PROGRAMS = \

     clamav_dbload_WDB_fuzzer \

     clamav_dbload_YARA_fuzzer

-dist_standalone_fuzz_target_runner_a_SOURCES = standalone_fuzz_target_runner.cpp

-noinst_LIBRARIES = standalone_fuzz_target_runner.a

+dist_libstandalone_fuzz_target_runner_a_SOURCES = standalone_fuzz_target_runner.cpp

+noinst_LIBRARIES = libstandalone_fuzz_target_runner.a

 dist_clamav_scanmap_fuzzer_SOURCES = clamav_scanmap_fuzzer.cpp

 clamav_scanmap_fuzzer_LDADD = $(LIB_FUZZING_ENGINE_DEPRECATED) @SSL_LIBS@ $(top_builddir)/libclamav/libclamav.la $(top_builddir)/libclamav/libclammspack.la

@@ -686,7 +686,7 @@ libclamav_la_SOURCES += bignum.h\

         tomsfastmath/sqr/fp_sqr_comba_small_set.c\

 	tomsfastmath/sqr/fp_sqrmod.c

-.PHONY: version.h.tmp

+.PHONY2: version.h.tmp

 version.c: version.h

 version.h: version.h.tmp

 	$(AM_V_GEN) if test -f version.h.static; then\

@@ -19,12 +19,13 @@ AC_CONFIG_AUX_DIR([config])

 AC_CONFIG_MACRO_DIR([m4])

 AC_CONFIG_HEADER([clamavcxx-config.h])

 AC_CANONICAL_TARGET

-AM_INIT_AUTOMAKE([1.9 -Wall -Wportability foreign no-define color-tests tar-pax])

+AM_INIT_AUTOMAKE([1.11 subdir-objects -Wall -Wportability foreign no-define color-tests tar-pax])

 AM_SILENT_RULES([yes])

 cxxset=${CXXFLAGS+set}

 AC_PROG_CXX

 AC_C_BIGENDIAN

+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])

 if test "$cxxset" != set; then

 # don't use the default -O2 -g because -g bloats the C++ binaries too much