Mercurial > octave
changeset 18338:7a1a71e3f328
configure.ac: Fix broken build with AMCOND_HAVE_LLVM.
* configure.ac: Move AM_CONDITIONAL call outside of if block so that it is
always assigned a value.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 22 Jan 2014 22:47:14 -0800 |
| parents | 313ebc905e38 |
| children | a91654d70f99 |
| files | configure.ac |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Jan 22 19:08:40 2014 -0800 +++ b/configure.ac Wed Jan 22 22:47:14 2014 -0800 @@ -866,9 +866,6 @@ LDFLAGS="$save_LDFLAGS" fi - AM_CONDITIONAL([AMCOND_HAVE_LLVM], - [test -z "$warn_llvm"]) - if test -z "$warn_llvm"; then AC_DEFINE(HAVE_LLVM, 1, [Define to 1 if LLVM is available.]) else @@ -890,6 +887,7 @@ AC_SUBST(LLVM_CXXFLAGS) AC_SUBST(LLVM_LDFLAGS) AC_SUBST(LLVM_LIBS) +AM_CONDITIONAL([AMCOND_HAVE_LLVM], [test -z "$warn_llvm"]) ### Check for HDF5 library. @@ -2830,7 +2828,8 @@ fi AM_CONDITIONAL([AMCOND_BUILD_GUI], [test $build_gui = yes]) -AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], [test "$octave_cv_lib_qscintilla" = yes]) +AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], + [test "$octave_cv_lib_qscintilla" = yes]) AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes]) AC_SUBST(QT_CPPFLAGS) AC_SUBST(QT_LDFLAGS)