[Libreoffice-commits] .: configure.ac

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Nov 26 13:19:14 PST 2012


 configure.ac |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 7af306fb2508f01b91749542fd383acc0e675e34
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Nov 26 22:19:20 2012 +0100

    check for python >= 3.3 in configure when building with python3
    
    Change-Id: If25d4d1d583caace32934d7a7230bb86330cfbed

diff --git a/configure.ac b/configure.ac
index 68cb5bc..572ec99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7448,6 +7448,20 @@ system)
        [])
     CPPFLAGS="$save_CPPFLAGS"
 
+    AC_LANG_PUSH(C)
+    CFLAGS="$CFLAGS $PYTHON_CFLAGS"
+    AC_MSG_CHECKING([for correct python library version])
+       AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <Python.h>
+
+int main(int argc, char **argv) {
+       if (PY_MAJOR_VERSION < 3 || (PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 3)) return 0;
+       else return 1;
+}
+       ]])],[AC_MSG_RESULT([ok])],[AC_MSG_ERROR([Python >= 3.3 is needed when building with Python 3])],[])
+    CFLAGS=$save_CFLAGS
+    AC_LANG_POP(C)
+
     dnl FIXME Check if the Python library can be linked with, too?
     ;;
 


More information about the Libreoffice-commits mailing list