# HG changeset patch # User Jaroslav Hajek # Date 1213170695 -7200 # Node ID b16aea89ec7232c92d648990f4aca6d8f777a4a6 # Parent a017ca5a2f750604460871f1f65f1053b1272db1 configure.in: fix invalid placement of variables restoration statements diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ 2008-06-05 John W. Eaton + + * configure.in: Move LIBS and CXXFLAGS restoration into + the proper block. + 2008-06-05 John W. Eaton * configure.in: Add FT2_CFLAGS to XTRA_CXXFLAGS, not CXXFLAGS. diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -666,10 +666,11 @@ FTGLTextureFont font("");], [ 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