Mercurial > octave

comparison m4/acinclude.m4 @ 24873:486bc22482ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve Doxygen generation. * configure.ac: Display the output of detected qhelpgenerator * m4/acinclude.m4: Detect qhelpgenerator alongside with other QT tools. * doc/doxyhtml/Doxyfile.in: Enable build of Qt Compressed Help (.qch) files. Pushed by Kai T. Ohlhus <k.ohlhus@gmail.com>
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Wed, 14 Mar 2018 12:27:19 +0100
parents ae6679369a80
children 7c7b60dd4d4c
comparison
equal deleted inserted replaced
24872:a26f8c97df21 24873:486bc22482ca
1920 fi 1920 fi
1921 else 1921 else
1922 LRELEASE="$LRELEASE_QTVER" 1922 LRELEASE="$LRELEASE_QTVER"
1923 fi 1923 fi
1924 1924
1925 if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE"; then 1925 AC_CHECK_TOOLS(QHELPGENERATOR_QTVER, [qhelpgenerator-qt$qt_version])
1926 if test -z "$QHELPGENERATOR_QTVER"; then
1927 AC_CHECK_TOOLS(QHELPGENERATOR, [qhelpgenerator])
1928 if test -n "$QHELPGENERATOR" && test -n "$QTCHOOSER"; then
1929 QHELPGENERATORFLAGS="-qt$qt_version"
1930 fi
1931 else
1932 QHELPGENERATOR="$QHELPGENERATOR_QTVER"
1933 fi
1934
1935 if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE" || test -z "$QHELPGENERATOR"; then
1926 warn_qt_tools="one or more of the Qt utility programs moc, uic, rcc, and lrelease not found; disabling Qt GUI" 1936 warn_qt_tools="one or more of the Qt utility programs moc, uic, rcc, and lrelease not found; disabling Qt GUI"
1927 build_qt_gui=no 1937 build_qt_gui=no
1928 MOC_QTVER= 1938 MOC_QTVER=
1929 UIC_QTVER= 1939 UIC_QTVER=
1930 RCC_QTVER= 1940 RCC_QTVER=
1931 LRELEASE_QTVER= 1941 LRELEASE_QTVER=
1932 MOC_FLAGS= 1942 QHELPGENERATOR_QTVER=
1933 UIC_FLAGS= 1943 MOCFLAGS=
1934 RCC_FLAGS= 1944 UICFLAGS=
1935 LRELEASE_FLAGS= 1945 RCCFLAGS=
1946 LRELEASEFLAGS=
1947 QHELPGENERATORFLAGS=
1936 $as_unset ac_cv_prog_MOC_QTVER 1948 $as_unset ac_cv_prog_MOC_QTVER
1937 $as_unset ac_cv_prog_ac_ct_MOC_QTVER 1949 $as_unset ac_cv_prog_ac_ct_MOC_QTVER
1938 $as_unset ac_cv_prog_UIC_QTVER 1950 $as_unset ac_cv_prog_UIC_QTVER
1939 $as_unset ac_cv_prog_ac_ct_UIC_QTVER 1951 $as_unset ac_cv_prog_ac_ct_UIC_QTVER
1940 $as_unset ac_cv_prog_RCC_QTVER 1952 $as_unset ac_cv_prog_RCC_QTVER
1941 $as_unset ac_cv_prog_ac_ct_RCC_QTVER 1953 $as_unset ac_cv_prog_ac_ct_RCC_QTVER
1942 $as_unset ac_cv_prog_LRELEASE_QTVER 1954 $as_unset ac_cv_prog_LRELEASE_QTVER
1943 $as_unset ac_cv_prog_ac_ct_LRELEASE_QTVER 1955 $as_unset ac_cv_prog_ac_ct_LRELEASE_QTVER
1956 $as_unset ac_cv_prog_QHELPGENERATOR_QTVER
1957 $as_unset ac_cv_prog_ac_ct_QHELPGENERATOR_QTVER
1944 fi 1958 fi
1945 fi 1959 fi
1946 1960
1947 if test $build_qt_gui = yes; then 1961 if test $build_qt_gui = yes; then
1948 AC_CHECK_FUNCS([setlocale], [], 1962 AC_CHECK_FUNCS([setlocale], [],