]> arthur.barton.de Git - bup.git/blobdiff - config/configure
Update base_version to 0.34~ for 0.34 development
[bup.git] / config / configure
index c7ab50c3819b2b7446b887101afe3bb278e104b2..657155a0fa1f011a4cd078d25f011db0b79d180e 100755 (executable)
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+ac_help="--with-pylint[=yes|no|maybe]  require and run pylint (maybe)"
+
 bup_find_prog()
 {
     # Prints prog path to stdout or nothing.
@@ -14,22 +16,67 @@ bup_find_prog()
 
 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
 }
 
+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
@@ -37,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}'`
@@ -58,19 +107,59 @@ expr "$MAKE_VERSION" '>=' '3.81' || AC_FAIL "ERROR: $MAKE must be >= version 3.8
 
 AC_SUB bup_make "$MAKE"
 
-bup_python="$(type -p "$PYTHON")"
-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 python '')"
-if test -z "$bup_python"; then
-    AC_FAIL "ERROR: unable to find python"
+
+# 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
-    AC_SUB bup_python "$bup_python"
-    AC_SUB bup_python_majver \
-           "$("$bup_python" -c 'import sys; print(sys.version_info[0])')"
+    for py_min_ver in 10 9 8 7 6; do
+        bup_python_config="$(bup_find_prog "python3.$py_min_ver-config" '')"
+        test -z "$bup_python_config" || break
+    done
+    test -z "$bup_python_config" \
+        && bup_python_config="$(bup_find_prog python3-config '')"
+    if test -z "$bup_python_config"; then
+        AC_FAIL "ERROR: unable to find a suitable python-config"
+    fi
+fi
+
+
+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"
@@ -98,25 +187,6 @@ 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
 
 mincore_incore_code="
@@ -167,29 +237,73 @@ if test "$ac_defined_HAVE_MINCORE"; then
     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 <stdio.h> // required by unpatched readline
+#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 <stdio.h> // required by unpatched readline
+#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
@@ -238,23 +352,30 @@ 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
 
-if test -e config.var; then rm -r config.var; fi
-mkdir -p config.var
-echo -n "$MAKE" > config.var/bup-make
-echo -n "$bup_python" > config.var/bup-python
+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 "$bup_python" python
+(cd bin && ln -s "$MAKE" make)
+
+touch finished
 
 printf "
-found: python (%q, $("$bup_python" --version 2>&1))
+found: python-config (%q)
 found: git (%q, ($("$bup_git" --version))
 " \
-       "$bup_python" \
+       "$bup_python_config" \
        "$bup_git" \
        1>&5