Mercurial > hg > octave-nkf
changeset 7887:627b10572d82
configure.in: fix invalid placement of variables restoration statements
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Wed, 11 Jun 2008 09:51:35 +0200 |
parents | e3e94982dfd4 |
children | c123bd09172e |
files | ChangeLog configure.in |
diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-06-12 Jaroslav Hajek <highegg@gmail.com> + + * configure.in: Move LIBS and CXXFLAGS restoration into + the proper block. + 2008-06-05 John W. Eaton <jwe@octave.org> * configure.in: Add FT2_CFLAGS to XTRA_CXXFLAGS, not CXXFLAGS.
--- a/configure.in +++ b/configure.in @@ -666,10 +666,11 @@ AC_DEFINE(HAVE_FTGL, 1, [Define to 1 if FTGL is present]) AC_MSG_RESULT(yes) XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"],[ - AC_MSG_RESULT(no)])],[ + AC_MSG_RESULT(no)]) + LIBS="$save_LIBS" + CXXFLAGS="$save_CXXFLAGS" + ],[ warn_graphics="FTGL library not found. Native renderer will not have on-screen text"]) - LIBS="$save_LIBS" - CXXFLAGS="$save_CXXFLAGS" AC_LANG_POP(C++) fi fi