[Olena-patches] last-svn-commit-522-g3a2500e Do not trigger an error when Qt is missing, too old or not working.

* configure.ac: Here. Protect a test from a variable expanding to an empty string. --- ChangeLog | 7 +++++++ configure.ac | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c85044..263dfff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Do not trigger an error when Qt is missing, too old or not working. + + * configure.ac: Here. + Protect a test from a variable expanding to an empty string. + +2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Have AutoTroll always restore the initial ``current directory''. * m4/autotroll.m4 (AT_WITH_QT): Always come back to the top-level diff --git a/configure.ac b/configure.ac index 4f0ddd6..63e26c0 100644 --- a/configure.ac +++ b/configure.ac @@ -216,8 +216,8 @@ AM_CONDITIONAL(HAVE_MAGICKXX, test "x$oln_have_magickxx" = xyes) # Qt. # # ---- # -AT_WITH_QT([xml], [], [], [], [oln_have_qt=yes]) -if test $oln_have_qt = yes; then +AT_WITH_QT([xml], [], [], [:], [oln_have_qt=yes]) +if test x$oln_have_qt = xyes; then AT_REQUIRE_QT_VERSION([4], AC_MSG_WARN([Qt-dependent programs will be disabled.]), oln_have_expected_qt_version=yes) -- 1.5.6.5