Mercurial > hg > octave-lojdl
changeset 9583:8dc1531e2149
correctly save and restore LIBS and CPPFLAGS when checking for GraphicsMagick++
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 27 Aug 2009 15:49:51 -0400 |
parents | bdcfb756d721 |
children | 0fcbfddaa87f |
files | ChangeLog configure.in |
diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-08-27 John W. Eaton <jwe@octave.org> + + * configure.in: Properly save and restore CPPFLAGS and LIBS when + checking for GraphicsMagick++. Don't temporarily change LDFLAGS. + 2009-08-27 Jaroslav Hajek <highegg@gmail.com> * aclocal.m4 (m4_ifblank, m4_ifnblank): State FSF copyright and markup
--- a/configure.in +++ b/configure.in @@ -585,11 +585,9 @@ warn_magick="GraphicsMagick++ library fails tests. The imread function for reading image files will not be fully functional." save_CPPFLAGS="$CPPFLAGS" - save_LDFLAGS="$LDFLAGS" save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $MAGICK_CPPFLAGS" - LDFLAGS="$LIBS $MAGICK_LDFLAGS" - LIBS="$LIBS $MAGICK_LIBS" + CPPFLAGS="$MAGICK_CPPFLAGS $CPPFLAGS" + LIBS="$MAGICK_LDFLAGS $MAGICK_LIBS $LIBS" AC_LANG_PUSH(C++) AC_CHECK_HEADER([Magick++.h], [ AC_MSG_CHECKING([for Magick::ColorRGB in Magick++.h]) @@ -602,7 +600,6 @@ ]) AC_LANG_POP(C++) CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" LIBS="$save_LIBS" ])