| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Use pkg-config instead of ${PYTHON}-config to find python |
| 2 | |
| 3 | diff -uNr pidgin-2.10.12.orig/configure.ac pidgin-2.10.12/configure.ac |
| 4 | --- pidgin-2.10.12.orig/configure.ac 2016-01-01 00:19:40.000000000 +0100 |
| 5 | +++ pidgin-2.10.12/configure.ac 2016-05-05 16:55:13.258945925 +0200 |
| 6 | @@ -1585,20 +1585,15 @@ |
| 7 | dnl Check for Python headers (currently useful only for libgnt) |
| 8 | dnl (Thanks to XChat) |
| 9 | if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then |
| 10 | - AC_MSG_CHECKING(for Python compile flags) |
| 11 | - if test -f ${PYTHON}-config; then |
| 12 | - PY_CFLAGS=`${PYTHON}-config --includes` |
| 13 | - PY_LIBS=`${PYTHON}-config --libs` |
| 14 | - AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.]) |
| 15 | - AC_MSG_RESULT(ok) |
| 16 | - else |
| 17 | - AC_MSG_RESULT([Cannot find ${PYTHON}-config]) |
| 18 | - PY_CFLAGS="" |
| 19 | - PY_LIBS="" |
| 20 | - fi |
| 21 | + AC_MSG_CHECKING(for Python compile flags) |
| 22 | + PKG_CHECK_MODULES(PY, python, [ |
| 23 | + AC_SUBST(PY_CFLAGS) |
| 24 | + AC_SUBST(PY_LIBS) |
| 25 | + ], [ |
| 26 | + AC_MSG_RESULT(no) |
| 27 | + AC_MSG_ERROR([Can't find python]) |
| 28 | + ]) |
| 29 | fi |
| 30 | -AC_SUBST(PY_CFLAGS) |
| 31 | -AC_SUBST(PY_LIBS) |
| 32 | |
| 33 | dnl ####################################################################### |
| 34 | dnl # Check for Mono support |