autoreconf

Makefile.in

@@ -563,7 +563,7 @@ pkgconfig_DATA = libclamav.pc
 # don't complain that configuration files and databases are not removed, this is intended
 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print
 DISTCLEANFILES = target.h
-DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-all-jit-targets --enable-llvm=yes --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-all-jit-targets --enable-llvm=yes --with-system-llvm=no --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 all: clamav-config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 

configure

@@ -18499,16 +18499,12 @@ $as_echo_n "checking pcre-config version... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcre_version" >&5
 $as_echo "$pcre_version" >&6; }
 
-    case $host_os in
-      darwin* )
-        pcrever_major=`echo "$pcre_version" | sed -Ee 's/([0-9]+).*/\1/'`
-        pcrever_minor=`echo "$pcre_version" | sed -Ee 's/[0-9]+\.([0-9]+).*/\1/'`
-        ;;
-      *)
-        pcrever_major=`echo "$pcre_version" | sed -re 's/([0-9]+).*/\1/'`
-        pcrever_minor=`echo "$pcre_version" | sed -re 's/[0-9]+\.([0-9]+).*/\1/'`
-        ;;
-    esac
+    pcrever_prefix=`expr "$pcre_version" : '\([^0-9]*\)'`
+    pcrever_frag=${pcre_version:${#pcrever_prefix}}
+
+    pcrever_major=`expr "$pcrever_frag" : '\([0-9]*\)'`
+    pcrever_frag=${pcrever_frag#*\.}
+    pcrever_major=`expr "$pcrever_frag" : '\([0-9]*\)'`
 
         if test "$pcrelib" = "pcre"; then
         if test $pcrever_major -lt 6; then

libclamav/c++/Makefile.in

@@ -5750,8 +5750,8 @@ maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@BUILD_EXTERNAL_LLVM_TRUE@clean-local:
 @BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
+@BUILD_EXTERNAL_LLVM_TRUE@clean-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \

libclamav/c++/configure

@@ -16573,22 +16573,15 @@ subdirs="$subdirs llvm"
 
 fi
 
-llvmver_val=`echo "$llvmver" | sed -e 's/svn//g'`
+llvmver_prefix=`expr "$llvmver" : '\([^0-9]*\)'`
+llvmver_frag=${llvmver:${#llvmver_prefix}}
+
+llvmver_major=`expr "$llvmver_frag" : '\([0-9]*\)'`
+llvmver_frag=${llvmver_frag#*\.}
+llvmver_minor=`expr "$llvmver_frag" : '\([0-9]*\)'`
+llvmver_frag=${llvmver_frag#*\.}
+llvmver_patch=`expr "$llvmver_frag" : '\([0-9]*\)'`
 
-case $host_os in
-  darwin* )
-    llvmver_sval=`echo "$llvmver_val" | sed -Ee 's/[0-9]+//' | sed -e 's/^\.//'`
-    llvmver_major=`echo "$llvmver_val"  | sed -Ee 's/([0-9]+).*/\1/'`
-    llvmver_minor=`echo "$llvmver_sval" | sed -Ee 's/([0-9]+).*/\1/'`
-    llvmver_patch=`echo "$llvmver_sval" | sed -Ee 's/[0-9]+//' | sed -e 's/^\.//' | sed -Ee 's/([0-9]+).*/\1/'`
-    ;;
-  *)
-    llvmver_sval=`echo "$llvmver_val" | sed -re 's/[0-9]+//' | sed -e 's/^\.//'`
-    llvmver_major=`echo "$llvmver_val"  | sed -re 's/([0-9]+).*/\1/'`
-    llvmver_minor=`echo "$llvmver_sval" | sed -re 's/([0-9]+).*/\1/'`
-    llvmver_patch=`echo "$llvmver_sval" | sed -re 's/[0-9]+//' | sed -e 's/^\.//' | sed -re 's/([0-9]+).*/\1/'`
-    ;;
-esac
 llvmver_suffix=
 if test "x$llvmver_patch" = "x"; then
     llvmver_patch=0