Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Mon, 17 Jun 2013 20:10:18 UTC Commit: d52b48c29cbe7807c6463d188ab38913c360c12e https://github.com/geany/geany-plugins/commit/d52b48c29cbe7807c6463d188ab389...

Log Message: ----------- GeanyPy: Properly honor disabling/automatic choice with Autotools

Modified Paths: -------------- build/geanypy.m4

Modified: build/geanypy.m4 24 files changed, 16 insertions(+), 8 deletions(-) =================================================================== @@ -2,15 +2,23 @@ AC_DEFUN([GP_CHECK_GEANYPY], [ GP_ARG_DISABLE([Geanypy], [auto]) GP_CHECK_PLUGIN_GTK2_ONLY([Geanypy]) - GP_COMMIT_PLUGIN_STATUS([Geanypy]) PKG_CHECK_MODULES([PYGTK], [pygtk-2.0]) - AX_PYTHON_DEVEL([>= '2.6']) - AX_PYTHON_LIBRARY(,[AC_MSG_ERROR([Cannot find Python library])]) - AC_SUBST([PYTHON]) - AC_DEFINE_UNQUOTED( - [GEANYPY_PYTHON_LIBRARY], - ["$PYTHON_LIBRARY"], - [Location of Python library to dlopen()]) + dnl FIXME: Checks for Python below should gracefully disable the plugin + dnl if they don't succeed and enable_geanypy is set to `auto`. + dnl However, since these macros don't seem to gracefully handle + dnl failure, and since if PyGTK is found they are likely to succeed + dnl anyway, we assume that if the plugin is not disabled at this + dnl point it is OK for these checks to be fatal. The user can pass + dnl always pass --disable-geanypy anyway. + AS_IF([! test x$enable_geanypy = xno], [ + AX_PYTHON_DEVEL([>= '2.6']) + AX_PYTHON_LIBRARY(,[AC_MSG_ERROR([Cannot find Python library])]) + AC_SUBST([PYTHON]) + AC_DEFINE_UNQUOTED([GEANYPY_PYTHON_LIBRARY], + ["$PYTHON_LIBRARY"], + [Location of Python library to dlopen()]) + ]) + GP_COMMIT_PLUGIN_STATUS([Geanypy]) AC_CONFIG_FILES([ geanypy/Makefile geanypy/src/Makefile

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).