# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1425754917 18000
# Node ID e50c777c9a970f2cef317b73d2a65a19d4cd4c24
# Parent  e2f0a87790ca3ec960f25866a157f9e6ebceff3c
explicitly set MOC, UIC, RCC, and LRELEASE for Octave configure commands

diff -r e2f0a87790ca -r e50c777c9a97 src/default-octave.mk
--- a/src/default-octave.mk	Sat Mar 07 13:55:26 2015 -0500
+++ b/src/default-octave.mk	Sat Mar 07 14:01:57 2015 -0500
@@ -41,6 +41,14 @@
   endif
 endif
 
+## If we allow the system Qt libraries to be used, then these
+## won't make sense.
+$(PKG)_QT_CONFIGURE_OPTIONS := \
+  MOC=$(HOST_BINDIR)/moc \
+  UIC=$(HOST_BINDIR)/uic \
+  RCC=$(HOST_BINDIR)/rcc \
+  LRELEASE=$(HOST_BINDIR)/lrelease
+
 ifneq ($(ENABLE_DOCS),yes)
   $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
 endif
@@ -116,6 +124,7 @@
         $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \
         $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
         $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \
+        $($(PKG)_QT_CONFIGURE_OPTIONS) \
         $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
         PKG_CONFIG='$(MXE_PKG_CONFIG)' \
         PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \
diff -r e2f0a87790ca -r e50c777c9a97 src/octave.mk
--- a/src/octave.mk	Sat Mar 07 13:55:26 2015 -0500
+++ b/src/octave.mk	Sat Mar 07 14:01:57 2015 -0500
@@ -38,6 +38,14 @@
   endif
 endif
 
+## If we allow the system Qt libraries to be used, then these
+## won't make sense.
+$(PKG)_QT_CONFIGURE_OPTIONS := \
+  MOC=$(HOST_BINDIR)/moc \
+  UIC=$(HOST_BINDIR)/uic \
+  RCC=$(HOST_BINDIR)/rcc \
+  LRELEASE=$(HOST_BINDIR)/lrelease
+
 ifneq ($(ENABLE_DOCS),yes)
   $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
 endif
@@ -113,6 +121,7 @@
         $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \
         $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
         $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \
+        $($(PKG)_QT_CONFIGURE_OPTIONS) \
         $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
         PKG_CONFIG='$(MXE_PKG_CONFIG)' \
         PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \
diff -r e2f0a87790ca -r e50c777c9a97 src/stable-octave.mk
--- a/src/stable-octave.mk	Sat Mar 07 13:55:26 2015 -0500
+++ b/src/stable-octave.mk	Sat Mar 07 14:01:57 2015 -0500
@@ -38,6 +38,14 @@
   endif
 endif
 
+## If we allow the system Qt libraries to be used, then these
+## won't make sense.
+$(PKG)_QT_CONFIGURE_OPTIONS := \
+  MOC=$(HOST_BINDIR)/moc \
+  UIC=$(HOST_BINDIR)/uic \
+  RCC=$(HOST_BINDIR)/rcc \
+  LRELEASE=$(HOST_BINDIR)/lrelease
+
 ifneq ($(ENABLE_DOCS),yes)
   $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
 endif
@@ -113,6 +121,7 @@
         $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \
         $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
         $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \
+        $($(PKG)_QT_CONFIGURE_OPTIONS) \
         $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
         PKG_CONFIG='$(MXE_PKG_CONFIG)' \
         PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \