colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fail configure if pygobject is not available

Browse Source 
There is on configure option to select for the use of pygobject.
We don't need it. If a user selects --enable-gtk-doc and
--with-introspection, we want to BUILD_SETTING_DOCS.
In this case, just require the python library too.
This commit is contained in:
Thomas Haller
2016-11-22 10:32:24 +01:00
parent 8f0c9e0d07
commit 5bd42a0ea9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@@ -1103,16 +1103,16 @@ AM_CONDITIONAL(INSTALL_PREGEN_MANPAGES, test "x${install_pregen_manpages}" = "xy
# check if we can build setting property documentation # check if we can build setting property documentation
if test -n "$INTROSPECTION_MAKEFILE" -a "$enable_gtk_doc" = "yes"; then if test -n "$INTROSPECTION_MAKEFILE" -a "$enable_gtk_doc" = "yes"; then
# If g-i is installed we know we have python, but we might not have pygobject # If g-i is installed we know we have python, but we might not have pygobject
if python -c 'from gi.repository import GObject' >& /dev/null; then if ! python -c 'from gi.repository import GObject' >& /dev/null; then
have_pyobject=yes AC_MSG_ERROR(["--enable-gtk-doc --with-introspection" aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
fi fi
# gtk-doc depends on perl, but we can check for it anyway # gtk-doc depends on perl, but we can check for it anyway
AC_PATH_PROG(PERL, perl, no) AC_PATH_PROG(PERL, perl, no)
if test "$have_pyobject" = "yes"; then build_setting_docs=yes
build_setting_docs=yes else
fi build_setting_docs=no
fi fi
# check for pre-built setting docs # check for pre-built setting docs
@@ -1217,6 +1217,7 @@ echo
echo "Miscellaneous:" echo "Miscellaneous:"
echo " documentation: $enable_gtk_doc" echo " documentation: $enable_gtk_doc"
echo " documentation-settings: $build_setting_docs"
echo " tests: $enable_tests" echo " tests: $enable_tests"
echo " more-asserts: $more_asserts" echo " more-asserts: $more_asserts"
echo " valgrind: $with_valgrind $with_valgrind_suppressions" echo " valgrind: $with_valgrind $with_valgrind_suppressions"