[gimp/wip/Jehan/pygtk-4-distcheck: 5/5] configure: look for pygtk-codegen-2.0 and pygtk defsdir in all cases.




commit 502804281ef38b4f4fbcac0943511d9024bbb5fa
Author: Jehan <jehan girinstud io>
Date:   Sun Aug 2 19:54:58 2020 +0200

    configure: look for pygtk-codegen-2.0 and pygtk defsdir in all cases.
    
    Even without Python enabled, these are used for the `dist` step, hence
    also for distcheck. These checks are not blocking normal builds though.

 configure.ac | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7fa6c8cf81..10c738feb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2295,6 +2295,16 @@ m4_define([pycheck_error], [
       *** passing --disable-python to configure (but then you will not be able
       *** to use scripts for GIMP that are written in Python)."])
 
+# pygtk-codegen-2.0 and the defsdir are used for the `dist` target,
+# regardless of whether Python is enabled or not. Their absence don't
+# break simple builds but we still check them.
+AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
+
+AC_MSG_CHECKING(for pygtk defs)
+PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+AC_SUBST(PYGTK_DEFSDIR)
+AC_MSG_RESULT($PYGTK_DEFSDIR)
+
 if test "x$enable_python" != xno; then
   enable_python="yes"
   # check for Python
@@ -2323,16 +2333,10 @@ if test "x$enable_python" != xno; then
   PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= pygtk_required_version,,
                     [pycheck_error([PyGTK pygtk_required_version or newer], [it])])
 
-  AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
   if test "x$PYGTK_CODEGEN" = xno; then
      pycheck_error([pygtk-codegen-2.0 script], [it])
   fi
 
-  AC_MSG_CHECKING(for pygtk defs)
-  PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-  AC_SUBST(PYGTK_DEFSDIR)
-  AC_MSG_RESULT($PYGTK_DEFSDIR)
-
   PKG_CHECK_MODULES(PYCAIRO, pycairo >= pycairo_required_version,,
                     [pycheck_error([PyCairo pycairo_required_version or newer], [it])])
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]