[gnome-builder] jedi: fix checking of python scripting support at configure time

[Christian Hergert <chergert src gnome org>]

commit 7943c5a3f94d7dc864b79a0d5ef693eaf573a397
Author: Christian Hergert <chergert redhat com>
Date:   Fri Jan 29 17:52:38 2016 +0100

    jedi: fix checking of python scripting support at configure time

 configure.ac              |   44 ++++++++++++++++++++++----------------------
 plugins/jedi/configure.ac |    6 +++++-
 2 files changed, 27 insertions(+), 23 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 98ac633..532e3d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,6 +209,28 @@ PKG_CHECK_MODULES(XML,      [gio-2.0 >= glib_required_version
 
 
 dnl ***********************************************************************
+dnl Check for Required Python
+dnl ***********************************************************************
+enable_python_scripting=no
+AS_IF([test "x$have_pygobject" = "xyes"],[
+       AM_PATH_PYTHON([3.2.3])
+       AC_PATH_TOOL(PYTHON3_CONFIG, "python3-config")
+
+       AS_IF([test -z "${PYTHON3_CONFIG}"],[
+               AC_MSG_RESULT([Failed to locate python3-config.])
+       ],[
+               LIBIDE_CFLAGS="${LIBIDE_CFLAGS} `${PYTHON3_CONFIG} --includes`"
+               LIBIDE_LIBS="${LIBIDE_LIBS} `${PYTHON3_CONFIG} --libs`"
+               LIBIDE_LDFLAGS="${LIBIDE_LDFLAGS} `${PYTHON3_CONFIG} --ldflags`"
+               enable_python_scripting=yes
+       ])
+
+       pyoverridesdir="\$(pyexecdir)/gi/overrides"
+       AC_SUBST(pyoverridesdir)
+])
+
+
+dnl ***********************************************************************
 dnl Check for supported plugins
 dnl ***********************************************************************
 m4_include([plugins/autotools/configure.ac])
@@ -243,28 +265,6 @@ m4_include([plugins/xml-pack/configure.ac])
 
 
 dnl ***********************************************************************
-dnl Check for Required Python
-dnl ***********************************************************************
-enable_python_scripting=no
-AS_IF([test "x$have_pygobject" = "xyes"],[
-       AM_PATH_PYTHON([3.2.3])
-       AC_PATH_TOOL(PYTHON3_CONFIG, "python3-config")
-
-       AS_IF([test -z "${PYTHON3_CONFIG}"],[
-               AC_MSG_RESULT([Failed to locate python3-config.])
-       ],[
-               LIBIDE_CFLAGS="${LIBIDE_CFLAGS} `${PYTHON3_CONFIG} --includes`"
-               LIBIDE_LIBS="${LIBIDE_LIBS} `${PYTHON3_CONFIG} --libs`"
-               LIBIDE_LDFLAGS="${LIBIDE_LDFLAGS} `${PYTHON3_CONFIG} --ldflags`"
-               enable_python_scripting=yes
-       ])
-
-       pyoverridesdir="\$(pyexecdir)/gi/overrides"
-       AC_SUBST(pyoverridesdir)
-])
-
-
-dnl ***********************************************************************
 dnl Define automake conditionals based on what we found
 dnl ***********************************************************************
 AM_CONDITIONAL(ENABLE_PYTHON_SCRIPTING, test x$enable_python_scripting != xno)
diff --git a/plugins/jedi/configure.ac b/plugins/jedi/configure.ac
index a84bf56..6b7e0b4 100644
--- a/plugins/jedi/configure.ac
+++ b/plugins/jedi/configure.ac
@@ -5,8 +5,12 @@ AC_ARG_ENABLE([jedi-plugin],
               [enable_jedi_plugin=$enableval],
               [enable_jedi_plugin=yes])
 
+AS_IF([test x$enable_python_scripting != xyes && test x$enable_jedi_plugin = xyes],[
+       enable_jedi_plugin=no
+])
+
 # for if ENABLE_JEDI_PLUGIN in Makefile.am
-AM_CONDITIONAL(ENABLE_JEDI_PLUGIN, test x$enable_python_scripting = xyes && test x$enable_jedi_plugin = xyes)
+AM_CONDITIONAL(ENABLE_JEDI_PLUGIN, test x$enable_jedi_plugin = xyes)
 
 # Ensure our makefile is generated by autoconf
 AC_CONFIG_FILES([plugins/jedi/Makefile])