LinGui: use the version of python found by configure

Fixes https://github.com/HandBrake/HandBrake/issues/1677

diff --git a/gtk/configure.ac b/gtk/configure.ac
index bd1916a49b8ae8f5a22bedbe7ef1a7b0a3b39a6c..93208785d8ffbe9c1d7153ac9a56787b356e50f3 100644 (file)
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -214,7 +214,13 @@ fi
 if test "x$use_qsv" = "xyes" ; then
     HB_LIBS="$HB_LIBS -lmfx"
 fi
+if test "x$PYTHON" != "x" ; then
+    HB_PYTHON="$PYTHON"
+else
+    HB_PYTHON="python2"
+fi
 
+AC_SUBST(HB_PYTHON)
 AC_SUBST(HB_LIBS)
 AC_SUBST(GHB_CFLAGS)
 AC_SUBST(GHB_LIBS)

diff --git a/gtk/module.rules b/gtk/module.rules
index d4242cf5a36d41e59fe2019bd9b9f654fbfe5baf..eaebdb3f5cc0366459d2725489e8c0899019a944 100644 (file)
--- a/gtk/module.rules
+++ b/gtk/module.rules
@@ -11,15 +11,17 @@ gtk.configure: $(GTK.CONFIGURE.stamp)
 
 $(GTK.CONFIGURE.stamp): | $(dir $(GTK.CONFIGURE.stamp))
 $(GTK.CONFIGURE.stamp): $(GTK.src/)Makefile.am
+$(GTK.CONFIGURE.stamp): $(BUILD/)GNUmakefile
 $(GTK.CONFIGURE.stamp): $(GTK.src/)configure.ac $(GTK.src/)src/Makefile.am
        set -e; cd $(GTK.src/); NOCONFIGURE=1 ./autogen.sh
        set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \
                $(GTK.CONFIGURE.extra) \
                PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig:$(PKG_CONFIG_PATH) \
-           CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \
-           LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \
-           --prefix=$(PREFIX) \
-           --with-hb=$(call fn.ABSOLUTE,$(BUILD/))
+               CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \
+               LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \
+               PYTHON="$(PYTHON.exe)" \
+               --prefix=$(PREFIX) \
+               --with-hb=$(call fn.ABSOLUTE,$(BUILD/))
        $(TOUCH.exe) $@
 
 gtk.build: | $(GTK.build/)

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 04888d3069499bf83ed53f7af86583791b5a90aa..9c3ed6b05eb8e92e46c45362bd17a707e9c13d5c 100644 (file)
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -171,7 +171,7 @@ resources.o: data_res.h
 
 widget_reverse.deps: makedeps.py
 widget.deps: makedeps.py
-       python2 $(srcdir)/makedeps.py
+       $(HB_PYTHON) $(srcdir)/makedeps.py
 
 fr.handbrake.ghb.appdata.xml.in: fr.handbrake.ghb.appdata.xml.template
        sed -e 's^RELEASE_TAG^<release version="$(HB.version)" date="$(word 1,$(HB.repo.date))" />^' $< > $@