configure/cleanup: support python 3.10

[bup.git] / config / configure

diff --git a/config/configure b/config/configure
index f1faa6e8a74cc735eec0d267a734cca761837445..d467af0e74405ccb9586a16d46ac0aff8f722b58 100755 (executable)
--- a/config/configure
+++ b/config/configure
@@ -35,6 +35,27 @@ bup_try_c_code()
     return $rc
 }
 
+bup_config_cflags=()
+
+bup-add-cflag-if-supported()
+{
+    local opt="$1"
+    if test -z "$opt"; then
+        AC_FAIL 'No option to check'
+    fi
+    TLOGN "checking for $AC_CC $opt support"
+    if bup_try_c_code \
+           "int main(int argc, char**argv) { return 0; }" \
+           "$opt";
+    then
+        bup_config_cflags+="$opt"
+        TLOG ' (found)'
+    else
+        TLOG ' (not found)'
+    fi
+}
+
+
 TARGET=bup
 
 argv=()
@@ -63,6 +84,8 @@ if ! AC_PROG_CC; then
     exit 1
 fi
 
+bup-add-cflag-if-supported -Wno-unused-command-line-argument
+
 for make_candidate in make gmake; do
     found_make="$(bup_find_prog "$make_candidate" "$MAKE")"
     if test "$found_make" \
@@ -96,7 +119,7 @@ if test "$BUP_PYTHON_CONFIG"; then
                          "$BUP_PYTHON_CONFIG")
     fi
 else
-    for py_maj_ver in 9 8 7 6; do
+    for py_maj_ver in 10 9 8 7 6; do
         bup_python_config="$(bup_find_prog "python3.$py_maj_ver-config" '')"
         test -z "$bup_python_config" || break
     done
@@ -165,24 +188,6 @@ fi
 AC_CHECK_FUNCS utimes
 AC_CHECK_FUNCS lutimes
 
-builtin_mul_overflow_code="
-#include <stddef.h>
-int main(int argc, char **argv)
-{
-    size_t n = 0, size = 0, total;
-    __builtin_mul_overflow(n, size, &total);
-    return 0;
-}
-"
-
-TLOGN "checking for __builtin_mul_overflow"
-if bup_try_c_code "$builtin_mul_overflow_code"; then
-    AC_DEFINE BUP_HAVE_BUILTIN_MUL_OVERFLOW 1
-    TLOG ' (found)'
-else
-    TLOG ' (not found)'
-fi
-
 
 AC_CHECK_FUNCS mincore
 
@@ -349,6 +354,8 @@ AC_SUB bup_have_libacl "$bup_have_libacl"
 AC_CC="$orig_ac_cc"
 LIBS="$orig_libs"
 
+AC_SUB bup_config_cflags "$bup_config_cflags"
+
 AC_OUTPUT config.vars
 
 set -euo pipefail