midx-cmd: accommodate python 3

[bup.git] / config / configure

diff --git a/config/configure b/config/configure
index 89da205674262c93ecd8b1b3746f3695bf6190b5..33e9ba26a00da52d3c769e536635483d7f3a7b17 100755 (executable)
--- a/config/configure
+++ b/config/configure
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 bup_find_prog()
 {
@@ -12,6 +12,20 @@ bup_find_prog()
     echo "$result"
 }
 
+bup_try_c_code()
+{
+    local code="$1" tmpdir rc
+    if test -z "$code"; then
+        AC_FAIL "No code provided to test compile"
+    fi
+    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"
+    rc=$?
+    rm -r "$tmpdir" || exit $?
+    return $rc
+}
+
 TARGET=bup
 
 . ./configure.inc
@@ -23,7 +37,7 @@ if ! AC_PROG_CC; then
     exit 1
 fi
 
-MAKE="$(bup_find_prog make $MAKE)"
+MAKE="$(bup_find_prog make "$MAKE")"
 if test -z "$MAKE"; then
     MAKE="$(bup_find_prog gmake "$GMAKE")"
 fi
@@ -42,8 +56,19 @@ 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_SUB bup_make "$MAKE"
+
+bup_python="$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"
+else
+    AC_SUB bup_python "$bup_python"
+    AC_SUB bup_python_majver \
+           "$("$bup_python" -c 'import sys; print(sys.version_info[0])')"
 fi
 
 if test -z "$(bup_find_prog git '')"; then
@@ -53,8 +78,13 @@ 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 +95,59 @@ 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 <unistd.h>
+#endif
+#if 0$ac_defined_HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+int main(int argc, char **argv)
+{
+    if (MINCORE_INCORE)
+      return 0;
+}
+"
+
+mincore_buf_type_code()
+{
+    local vec_type="$1"
+    echo "
+#include <sys/mman.h>
+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
+
+
 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
@@ -78,3 +159,7 @@ AC_CHECK_FIELD stat st_ctimensec sys/types.h sys/stat.h unistd.h
 AC_CHECK_FIELD tm tm_gmtoff time.h
 
 AC_OUTPUT config.vars
+
+mkdir -p config.var
+echo -n "$MAKE" > config.var/bup-make
+echo -n "$bup_python" > config.var/bup-python