diff options
author | Yves Combe <ycombe@src.gnome.org> | 2006-11-09 09:53:06 (GMT) |
---|---|---|
committer | Yves Combe <ycombe@src.gnome.org> | 2006-11-09 09:53:06 (GMT) |
commit | a9b4f53ad3f94c572f02b1351ccda8dcc4b5bb46 (patch) | |
tree | 1b418bdd3fd4ea7369b2b28457d3753189bca7a5 /acinclude.m4 | |
parent | df642cc058ca8a81a780b0787040d085198148a3 (diff) |
Landing of GCOMPRIS_8_2_CROSSCOMPIL branch.
Allow cross compilation for win32 with mingw/Linux.
Use GLib functions instead of unix one .
Adapt Tuxpaint launcher to make it work on Windows.
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index a351e4d..9ea0a8e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -43,18 +43,25 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS], [AC_REQUIRE([AM_PATH_PYTHON]) AC_MSG_CHECKING(for headers required to compile python extensions) dnl deduce PYTHON_CFLAGS -py_prefix=`$PYTHON -c "import sys; print sys.prefix"` -py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` -PYTHON_CFLAGS="-I${py_prefix}/include/python${PYTHON_VERSION}" -python_link=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBRARY\")" | sed -e "s%lib\(.*\)\.[[a-zA-Z]]*$%-l\1%"` +if test "x$PYTHON_CFLAGS" = "x" ; then + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` -python_libdir=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBDIR\")"` + PYTHON_CFLAGS="-I${py_prefix}/include/python${PYTHON_VERSION}" -PYTHON_LIBS="-L${python_libdir} ${python_link}" -if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_CFLAGS="$PYTHON_CFLAGS -I${py_exec_prefix}/include/python${PYTHON_VERSION}" + if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_CFLAGS="$PYTHON_CFLAGS -I${py_exec_prefix}/include/python${PYTHON_VERSION}" + fi +fi + +if test "x$PYTHON_LIBS" = "x" ; then + python_link=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBRARY\")" | sed -e "s%lib\(.*\)\.[[a-zA-Z]]*$%-l\1%"` + + python_libdir=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBDIR\")"` + + PYTHON_LIBS="-L${python_libdir} ${python_link}" fi AC_SUBST(PYTHON_CFLAGS) |