Mercurial > octave

diff m4/acinclude.m4 @ 24938:4f1da669b610 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: export and use qcollectiongenerator command line options correctly * acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Export QCOLLECTIONGENERATORFLAGS and QHELPGENERATORFLAGS. * doc/interpreter/module.mk ($(OCTAVE_QTHELP_FILES)): Add command line options from $(QCOLLECTIONGENERATORFLAGS).
author Mike Miller <mtmiller@octave.org>
date Mon, 19 Mar 2018 20:20:25 -0700
parents d664734ce8eb
children 91671d57817e
line wrap: on
line diff
--- a/m4/acinclude.m4	Mon Mar 19 19:12:43 2018 -0700
+++ b/m4/acinclude.m4	Mon Mar 19 20:20:25 2018 -0700
@@ -1955,8 +1955,8 @@
       UICFLAGS=
       RCCFLAGS=
       LRELEASEFLAGS=
+      QCOLLECTIONGENERATORFLAGS=
       QHELPGENERATORFLAGS=
-      QCOLLECTIONGENERATORFLAGS=
       $as_unset ac_cv_prog_MOC_QTVER
       $as_unset ac_cv_prog_ac_ct_MOC_QTVER
       $as_unset ac_cv_prog_UIC_QTVER
@@ -1965,6 +1965,8 @@
       $as_unset ac_cv_prog_ac_ct_RCC_QTVER
       $as_unset ac_cv_prog_LRELEASE_QTVER
       $as_unset ac_cv_prog_ac_ct_LRELEASE_QTVER
+      $as_unset ac_cv_prog_QCOLLECTIONGENERATOR_QTVER
+      $as_unset ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER
       $as_unset ac_cv_prog_QHELPGENERATOR_QTVER
       $as_unset ac_cv_prog_ac_ct_QHELPGENERATOR_QTVER
     fi
@@ -2057,6 +2059,8 @@
   AC_SUBST(UICFLAGS)
   AC_SUBST(RCCFLAGS)
   AC_SUBST(LRELEASEFLAGS)
+  AC_SUBST(QCOLLECTIONGENERATORFLAGS)
+  AC_SUBST(QHELPGENERATORFLAGS)
   AC_SUBST(QT_CPPFLAGS)
   AC_SUBST(QT_LDFLAGS)
   AC_SUBST(QT_LIBS)