bup_try_c_code()
{
- local code="$1" tmpdir rc
+ local code="$1" tmpdir rc cflags=''
if test -z "$code"; then
AC_FAIL "No code provided to test compile"
fi
+ case "$#" in
+ 1) ;;
+ 2) cflags="$2" ;;
+ *)
+ AC_FAIL "Invald call to bup_try_c_code" "$@"
+ ;;
+ esac
tmpdir="$(mktemp -d "bup-try-c-compile-XXXXXXX")" || exit $?
echo "$code" > "$tmpdir/test.c" || exit $?
- $AC_CC -Wall -Werror -c -o "$tmpdir/test" "$tmpdir/test.c"
+ $AC_CC -Wall -Werror $cflags -c -o "$tmpdir/test" "$tmpdir/test.c"
rc=$?
rm -r "$tmpdir" || exit $?
return $rc
test -z "$bup_python" && bup_python="$(bup_find_prog python2.7 '')"
test -z "$bup_python" && bup_python="$(bup_find_prog python2.6 '')"
test -z "$bup_python" && bup_python="$(bup_find_prog python2 '')"
+test -z "$bup_python" && bup_python="$(bup_find_prog python3.8 '')"
+test -z "$bup_python" && bup_python="$(bup_find_prog python3.7 '')"
+test -z "$bup_python" && bup_python="$(bup_find_prog python3.6 '')"
+test -z "$bup_python" && bup_python="$(bup_find_prog python3 '')"
test -z "$bup_python" && bup_python="$(bup_find_prog python '')"
if test -z "$bup_python"; then
AC_FAIL "ERROR: unable to find python"
else
AC_SUB bup_python "$bup_python"
- AC_SUB bup_python_majver \
- "$("$bup_python" -c 'import sys; print(sys.version_info[0])')"
+ bup_python_majver=$("$bup_python" -c 'import sys; print(sys.version_info[0])')
+ bup_python_minver=$("$bup_python" -c 'import sys; print(sys.version_info[1])')
+ AC_SUB bup_python_majver "$bup_python_majver"
fi
-if test -z "$(bup_find_prog git '')"; then
+# May not be correct yet, i.e. actual requirement may be higher.
+if test "$bup_python_majver" -gt 2 -a "$bup_python_minver" -lt 3; then
+ # utime follow_symlinks >= 3.3
+ bup_version_str=$("$bup_python" --version 2>&1)
+ AC_FAIL "ERROR: found $bup_version_str (must be >= 3.3 if >= 3)"
+fi
+
+bup_git="$(bup_find_prog git '')"
+if test -z "$bup_git"; then
AC_FAIL "ERROR: unable to find git"
fi
AC_CHECK_HEADERS linux/fs.h
AC_CHECK_HEADERS sys/ioctl.h
-# On GNU/kFreeBSD utimensat is defined in GNU libc, but won't work.
-if [ -z "$OS_GNU_KFREEBSD" ]; then
- AC_CHECK_FUNCS utimensat
+if test "$bup_python_majver" -gt 2; then
+ AC_DEFINE BUP_USE_PYTHON_UTIME 1
+else # Python 2
+ # On GNU/kFreeBSD utimensat is defined in GNU libc, but won't work.
+ if [ -z "$OS_GNU_KFREEBSD" ]; then
+ AC_CHECK_FUNCS utimensat
+ fi
+ AC_CHECK_FUNCS utimes
+ AC_CHECK_FUNCS lutimes
fi
-AC_CHECK_FUNCS utimes
-AC_CHECK_FUNCS lutimes
-
builtin_mul_overflow_code="
#include <stddef.h>
fi
fi
+
TLOGN "checking for readline"
+bup_have_readline=''
+bup_readline_includes_in_subdir=''
+bup_readline_via_pkg_config=''
+# We test this specific thing because it should work everywhere and it was
+# a particulary problem on macos (we'd get the wrong includes if we just
+# tested that the includes work).
+readline_test_code='
+ static char *on_completion_entry(const char *text, int state) { return NULL; }
+ void bup_test(void) { rl_completion_entry_function = on_completion_entry; }
+'
if pkg-config readline; then
bup_readline_cflags="$(pkg-config readline --cflags)" || exit $?
bup_readline_ldflags="$(pkg-config readline --libs)" || exit $?
- bup_have_readline=1
- AC_DEFINE BUP_HAVE_READLINE 1
- TLOG ' (yes, pkg-config)'
-elif bup_try_c_code '#include <readline/readline.h>'; then
- bup_readline_cflags=''
- bup_readline_ldflags=-lreadline
- bup_have_readline=1
+ # It looks like it's not uncommon for pkg-config to provide a -I
+ # that doesn't support the documentation's specified #include
+ # <readline/readline.h>. See what's really going on.
+ if bup_try_c_code "#include <readline/readline.h> $readline_test_code" \
+ "$bup_readline_cflags"
+ then
+ bup_have_readline=1
+ bup_readline_includes_in_subdir=1
+ elif bup_try_c_code "#include <readline.h> $readline_test_code" \
+ "$bup_readline_cflags"
+ then
+ bup_have_readline=1
+ fi
+ if test "$bup_have_readline"; then
+ bup_readline_via_pkg_config=1
+ else
+ bup_readline_cflags=''
+ bup_readline_ldflags=''
+ fi
+fi
+if ! test "$bup_have_readline"; then
+ if bup_try_c_code "#include <readline/readline.h> $readline_test_code"; then
+ bup_readline_ldflags=-lreadline
+ bup_have_readline=1
+ bup_readline_includes_in_subdir=1
+ elif bup_try_c_code "#include <readline.h> $readline_test_code"; then
+ bup_readline_ldflags=-lreadline
+ bup_have_readline=1
+ fi
+fi
+if test "$bup_have_readline"; then
AC_DEFINE BUP_HAVE_READLINE 1
- TLOG ' (yes)'
-else
- bup_readline_cflags=''
- bup_readline_ldflags=''
- bup_have_readline=''
- TLOG ' (no)'
+ if test "$bup_readline_includes_in_subdir"; then
+ AC_DEFINE BUP_READLINE_INCLUDES_IN_SUBDIR 1
+ fi
+ if test "$bup_readline_via_pkg_config"; then
+ TLOG ' (yes, pkg-config)'
+ else
+ TLOG ' (yes)'
+ fi
fi
+
+
AC_SUB bup_readline_cflags "$bup_readline_cflags"
AC_SUB bup_readline_ldflags "$bup_readline_ldflags"
AC_SUB bup_have_readline "$bup_have_readline"
+
AC_CHECK_FIELD stat st_atim sys/types.h sys/stat.h unistd.h
AC_CHECK_FIELD stat st_mtim sys/types.h sys/stat.h unistd.h
AC_CHECK_FIELD stat st_ctim sys/types.h sys/stat.h unistd.h
if test -e bin; then rm -r bin; fi
mkdir -p bin
-cd bin && ln -s "$bup_python" python
+(cd bin && ln -s "$bup_python" python)
+
+printf "
+found: python (%q, $("$bup_python" --version 2>&1))
+found: git (%q, ($("$bup_git" --version))
+" \
+ "$bup_python" \
+ "$bup_git" \
+ 1>&5
+
+summarize()
+{
+ local found="$1"
+ shift
+ if test "$found"; then
+ TLOG found: "$@"
+ else
+ TLOG not found: "$@"
+ fi
+}
+summarize "$bup_have_readline" 'readline support (e.g. bup ftp)'
+summarize "$bup_have_libacl" 'POSIX ACL support'
+TLOG