1 --- dia-0.97.2/acinclude.m4~ 2011-03-20 12:18:13.000000000 +0100
2 +++ dia-0.97.2/acinclude.m4 2011-12-31 13:03:18.989732048 +0100
4 [AC_REQUIRE([AM_PATH_PYTHON])
5 AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
7 -AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a)
8 +AC_MSG_CHECKING(for libpython${PYTHON_VERSION})
10 py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config"
12 py_makefile="${py_config_dir}/Makefile"
13 -if test -f "$py_makefile"; then
14 -dnl extra required libs
15 - py_basemodlibs=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $py_makefile`
16 - py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile`
18 -dnl now the actual libpython
19 - if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then
20 - PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs"
21 - AC_MSG_RESULT(found)
22 - elif test -e "${py_prefix}/${py_lib}/libpython${PYTHON_VERSION}.a"; then
23 - dnl Same as above, but looking into the previous location: bug #581533
24 - PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs"
25 - AC_MSG_RESULT(found)
27 - AC_MSG_RESULT(not found lib)
30 - AC_MSG_RESULT(not found config)
32 +PYTHON_LIBS="-lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs"
34 AC_SUBST(PYTHON_LIBS)])
36 # We need this because freetype is optional