X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=config%2Fconfigure;h=d467af0e74405ccb9586a16d46ac0aff8f722b58;hb=38967c64cfaf160fadebe24c27c339c4d6657c8e;hp=89da205674262c93ecd8b1b3746f3695bf6190b5;hpb=437fedd07ee327c14b11cb19f6c0519ef1e50884;p=bup.git diff --git a/config/configure b/config/configure index 89da205..d467af0 100755 --- a/config/configure +++ b/config/configure @@ -1,4 +1,6 @@ -#!/bin/sh +#!/usr/bin/env bash + +ac_help="--with-pylint[=yes|no|maybe] require and run pylint (maybe)" bup_find_prog() { @@ -12,10 +14,69 @@ bup_find_prog() echo "$result" } +bup_try_c_code() +{ + 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 $cflags -c -o "$tmpdir/test" "$tmpdir/test.c" + rc=$? + rm -r "$tmpdir" || exit $? + 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=() +with_pylint=maybe +while test $# -gt 0; do + case "$1" in + --with-pylint=yes) with_pylint=yes; shift;; + --with-pylint=maybe) with_pylint=maybe; shift;; + --with-pylint=no) with_pylint=no; shift;; + *) argv+=("$1"); shift;; + esac +done + +# Set $@ to the adjusted args +set - "${argv[@]}" + . ./configure.inc +# FIXME: real tmpdir +rm -rf finished config/bin config.var config.var.tmp config.vars + AC_INIT $TARGET if ! AC_PROG_CC; then @@ -23,17 +84,19 @@ if ! AC_PROG_CC; then exit 1 fi -MAKE="$(bup_find_prog make $MAKE)" -if test -z "$MAKE"; then - MAKE="$(bup_find_prog gmake "$GMAKE")" -fi +bup-add-cflag-if-supported -Wno-unused-command-line-argument -if test -z "$MAKE"; then - AC_FAIL "ERROR: unable to find make" -fi +for make_candidate in make gmake; do + found_make="$(bup_find_prog "$make_candidate" "$MAKE")" + if test "$found_make" \ + && ("$found_make" --version | grep "GNU Make"); then + MAKE="$found_make" + break; + fi +done -if ! ($MAKE --version | grep "GNU Make"); then - AC_FAIL "ERROR: $MAKE is not GNU Make" +if ! test "$MAKE"; then + AC_FAIL "ERROR: unable to find GNU make as make or gmake" fi MAKE_VERSION=`$MAKE --version | grep "GNU Make" | awk '{print $3}'` @@ -42,19 +105,78 @@ if [ -z "$MAKE_VERSION" ]; then fi expr "$MAKE_VERSION" '>=' '3.81' || AC_FAIL "ERROR: $MAKE must be >= version 3.81" -if test -z "$(bup_find_prog python '')"; then - AC_FAIL "ERROR: unable to find python" +AC_SUB bup_make "$MAKE" + + +# Haven't seen a documented way to determine the python version via +# python-config right now, so we'll defer version checking until +# later. + +if test "$BUP_PYTHON_CONFIG"; then + bup_python_config="$(type -p "$BUP_PYTHON_CONFIG")" + if test -z "$bup_python_config"; then + AC_FAIL $(printf "ERROR: BUP_PYTHON_CONFIG value %q appears invalid" \ + "$BUP_PYTHON_CONFIG") + fi +else + 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 + test -z "$bup_python_config" \ + && bup_python_config="$(bup_find_prog python3-config '')" + test -z "$bup_python_config" \ + && bup_python_config="$(bup_find_prog python2.7-config '')" + if test -z "$bup_python_config"; then + AC_FAIL "ERROR: unable to find a suitable python-config" + fi fi -if test -z "$(bup_find_prog git '')"; then + +bup_python_cflags=$("$bup_python_config" --cflags) || exit $? +bup_python_ldflags=$("$bup_python_config" --ldflags) || exit $? +bup_python_cflags_embed=$("$bup_python_config" --cflags --embed) +if test $? -eq 0; then + bup_python_ldflags_embed=$("$bup_python_config" --ldflags --embed) || exit $? +else # Earlier versions didn't support --embed + bup_python_cflags_embed=$("$bup_python_config" --cflags) || exit $? + bup_python_ldflags_embed=$("$bup_python_config" --ldflags) || exit $? +fi + +bup_python_cflags="$bup_python_cflags -fPIC" + +case "$OSTYPE" in + darwin*) + # For at least 10.3+ (2003+) + bup_python_ldflags="$bup_python_ldflags -bundle -undefined dynamic_lookup" + ;; + *) + bup_python_ldflags="$bup_python_ldflags -shared" + ;; +esac + +AC_SUB bup_python_config "$bup_python_config" +AC_SUB bup_python_cflags "$bup_python_cflags" +AC_SUB bup_python_ldflags "$bup_python_ldflags" +AC_SUB bup_python_cflags_embed "$bup_python_cflags_embed" +AC_SUB bup_python_ldflags_embed "$bup_python_ldflags_embed" + + +bup_git="$(bup_find_prog git '')" +if test -z "$bup_git"; then AC_FAIL "ERROR: unable to find git" fi # For stat. AC_CHECK_HEADERS sys/stat.h AC_CHECK_HEADERS sys/types.h + +# For stat and mincore. AC_CHECK_HEADERS unistd.h +# For mincore. +AC_CHECK_HEADERS sys/mman.h + # For FS_IOC_GETFLAGS and FS_IOC_SETFLAGS. AC_CHECK_HEADERS linux/fs.h AC_CHECK_HEADERS sys/ioctl.h @@ -65,8 +187,125 @@ if [ -z "$OS_GNU_KFREEBSD" ]; then fi AC_CHECK_FUNCS utimes AC_CHECK_FUNCS lutimes + + AC_CHECK_FUNCS mincore +mincore_incore_code=" +#if 0$ac_defined_HAVE_UNISTD_H +#include +#endif +#if 0$ac_defined_HAVE_SYS_MMAN_H +#include +#endif +int main(int argc, char **argv) +{ + if (MINCORE_INCORE) + return 0; +} +" + +mincore_buf_type_code() +{ + local vec_type="$1" + echo " +#include +int main(int argc, char **argv) +{ + void *x = 0; + $vec_type *buf = 0; + return mincore(x, 0, buf); +}" || exit $? +} + +if test "$ac_defined_HAVE_MINCORE"; then + TLOGN "checking for MINCORE_INCORE" + if bup_try_c_code "$mincore_incore_code"; then + AC_DEFINE BUP_HAVE_MINCORE_INCORE 1 + TLOG ' (found)' + else + TLOG ' (not found)' + fi + + TLOGN "checking mincore buf type" + if bup_try_c_code "$(mincore_buf_type_code char)"; then + AC_DEFINE BUP_MINCORE_BUF_TYPE 'char' + TLOG ' (char)' + elif bup_try_c_code "$(mincore_buf_type_code 'unsigned char')"; then + AC_DEFINE BUP_MINCORE_BUF_TYPE 'unsigned char' + TLOG ' (unsigned char)' + else + AC_FAIL "ERROR: unexpected mincore definition; please notify bup-list@googlegroups.com" + 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 $? + # It looks like it's not uncommon for pkg-config to provide a -I + # that doesn't support the documentation's specified #include + # . See what's really going on. + if bup_try_c_code "#include // required by unpatched readline +#include +$readline_test_code" \ + "$bup_readline_cflags" + then + bup_have_readline=1 + bup_readline_includes_in_subdir=1 + elif bup_try_c_code "#include // required by unpatched readline +#include +$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_test_code"; then + bup_readline_ldflags=-lreadline + bup_have_readline=1 + bup_readline_includes_in_subdir=1 + elif bup_try_c_code "#include $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 + 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 @@ -77,4 +316,81 @@ AC_CHECK_FIELD stat st_ctimensec sys/types.h sys/stat.h unistd.h AC_CHECK_FIELD tm tm_gmtoff time.h + +orig_ac_cc="$AC_CC" +orig_libs="$LIBS" +TLOGN "checking for libacl" +if pkg-config libacl; then + bup_libacl_cflags="$(pkg-config libacl --cflags)" + bup_libacl_ldflags="$(pkg-config libacl --libs)" + TLOG ' (yes, pkg-config)' +else + bup_libacl_cflags= + bup_libacl_ldflags='-lacl' + TLOG ' (yes)' +fi +AC_CC="$AC_CC${bup_libacl_cflags:+ $bup_libacl_cflags}" +LIBS="$bup_libacl_ldflags" +AC_CHECK_HEADERS sys/acl.h +AC_CHECK_HEADERS acl/libacl.h +AC_CHECK_FUNCS acl_get_file +AC_CHECK_FUNCS acl_from_text +AC_CHECK_FUNCS acl_set_file +# Note: These are linux specific, but we need them (for now?) +AC_CHECK_FUNCS acl_extended_file +AC_CHECK_FUNCS acl_to_any_text +TLOGN "checking for complete acl support" +if test "$ac_defined_HAVE_ACL_EXTENDED_FILE"; then + bup_have_libacl=1 + AC_SUB bup_libacl_cflags "$bup_libacl_cflags" + AC_SUB bup_libacl_ldflags "$bup_libacl_ldflags" + TLOG ' (yes)' +else + bup_have_libacl= + AC_SUB bup_have_libacl '' + TLOG ' (no)' +fi +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 + +# FIXME: real tmpdir +mkdir -p config.var.tmp +echo -n "$MAKE" > config.var.tmp/bup-make +echo -n "$bup_python_config" > config.var.tmp/bup-python-config +echo -n "$with_pylint" > config.var.tmp/with-pylint +mv config.var.tmp config.var + +if test -e bin; then rm -r bin; fi +mkdir -p bin +(cd bin && ln -s "$MAKE" make) + +touch finished + +printf " +found: python-config (%q) +found: git (%q, ($("$bup_git" --version)) +" \ + "$bup_python_config" \ + "$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