[geany/geany] 78c6a2: Fix check for GtkDoc header generation dependencies

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Thu, 03 Mar 2016 13:49:37 UTC
Commit:      78c6a2ad6dfafb206024e828cb76ec3229768ab4
             https://github.com/geany/geany/commit/78c6a2ad6dfafb206024e828cb76ec3229768ab4

Log Message:
-----------
Fix check for GtkDoc header generation dependencies

The checks itself were correct, but the logic for the final decision
didn't properly handle `--enable-gtkdoc-header=auto`, which also
happens to be the default.

Also fix hiding error messages from Python when trying to import the
`lxml` module to see whether it's available or not.

Closes #929.


Modified Paths:
--------------
    m4/geany-gtkdoc-header.m4

Modified: m4/geany-gtkdoc-header.m4
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -26,7 +26,7 @@ AC_DEFUN([GEANY_CHECK_GTKDOC_HEADER],
 		AS_IF([test "x$have_python" = xyes],
 		      [have_python_and_lxml=yes
 		       AC_MSG_CHECKING([for python lxml package])
-		       AS_IF([$PYTHON -c 'import lxml' 2>&1 >/dev/null],
+		       AS_IF([$PYTHON -c 'import lxml' >/dev/null 2>&1],
 		             [have_python_and_lxml=yes],
 		             [have_python_and_lxml=no])
 		       AC_MSG_RESULT([$have_python_and_lxml])],
@@ -34,7 +34,7 @@ AC_DEFUN([GEANY_CHECK_GTKDOC_HEADER],
 		dnl final result
 		AS_IF([test "x$geany_enable_gtkdoc_header$have_python_and_lxml" = "xyesno"],
 		      [_GEANY_CHECK_GTKDOC_HEADER_ERROR([python or its lxml module not found])],
-		      [geany_enable_gtkdoc_header=yes])
+		      [geany_enable_gtkdoc_header=$have_python_and_lxml])
 	])
 
 	AM_CONDITIONAL([ENABLE_GTKDOC_HEADER], [test "x$geany_enable_gtkdoc_header" = "xyes"])



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