Mercurial > octave
diff m4/acinclude.m4 @ 24875:7c7b60dd4d4c
Generate Qt compressed help and collection files for the manual (bug #53006)
* prepare_qhelp.py: New python script to prepare XML qcollectiongenerator files
* configure.ac: Display the output of detected qcollectiongenerator
* m4/acinclude.m4: Detect qcollectiongenerator alongside with other QT tools.
* doc/interpreter/module.mk: Add rules to build octave_interpreter.qhc and .qch
and install them in "octdocdir"
* run-octave.in: export OCTAVE_QTHELP_COLLECTION to access collection file and
compressed help.
* Makefile.am: add doc-interpreter-install-doc-local to install-data-local
prerequisites
* build-aux/subst-default-vals.in.sh, libinterp/corefcn/default-defs.in.h, libinterp/corefcn/defaults.cc/h, src/octave-config.in.cc: copy "octdatadir" handling
for "octdocdir".
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Mon, 12 Feb 2018 23:53:16 +0100 |
| parents | 486bc22482ca |
| children | d664734ce8eb |
line wrap: on
line diff
--- a/m4/acinclude.m4 Wed Mar 14 14:29:50 2018 +0100 +++ b/m4/acinclude.m4 Mon Feb 12 23:53:16 2018 +0100 @@ -1921,6 +1921,16 @@ else LRELEASE="$LRELEASE_QTVER" fi + + AC_CHECK_TOOLS(QCOLLECTIONGENERATOR_QTVER, [qcollectiongenerator-qt$qt_version]) + if test -z "$QCOLLECTIONGENERATOR_QTVER"; then + AC_CHECK_TOOLS(QCOLLECTIONGENERATOR, [qcollectiongenerator]) + if test -n "$QCOLLECTIONGENERATOR" && test -n "$QTCHOOSER"; then + QCOLLECTIONGENERATORFLAGS="-qt$qt_version" + fi + else + QCOLLECTIONGENERATOR="$QCOLLECTIONGENERATOR_QTVER" + fi AC_CHECK_TOOLS(QHELPGENERATOR_QTVER, [qhelpgenerator-qt$qt_version]) if test -z "$QHELPGENERATOR_QTVER"; then @@ -1932,19 +1942,21 @@ QHELPGENERATOR="$QHELPGENERATOR_QTVER" fi - if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE" || test -z "$QHELPGENERATOR"; then + if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE" || test -z "$QCOLLECTIONGENERATOR" || test -z "$QHELPGENERATOR"; then warn_qt_tools="one or more of the Qt utility programs moc, uic, rcc, and lrelease not found; disabling Qt GUI" build_qt_gui=no MOC_QTVER= UIC_QTVER= RCC_QTVER= LRELEASE_QTVER= + QCOLLECTIONGENERATOR_QTVER= QHELPGENERATOR_QTVER= MOCFLAGS= UICFLAGS= RCCFLAGS= LRELEASEFLAGS= 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