--- ChangeLog | 4 ++++ configure.ac | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 1d18b62..147f653 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-09-15 Roland Levillain roland@lrde.epita.fr + + * configure.ac: Fix the initialization of Magick++ flags. + 2011-09-15 Guillaume Lazzara z@lrde.epita.fr

* distrib/macports/Portfile.in: Force the use of GraphicsMagick. diff --git a/configure.ac b/configure.ac index 670727b..47efa55 100644 --- a/configure.ac +++ b/configure.ac @@ -218,10 +218,11 @@ OLN_WITH_LIB_PKG_CONFIG([GraphicsMagick++], [Magick++.h], [Magick++], # If both ImageMagick and GraphicsMagic are available, choose the # former by default. (Use `--with-imagemagickxx=no' to ignore an # installation of ImageMagick and let configure try GraphicsMagick). -if test "x$oln_have_imagemagickxx"; then +if test "x$with_imagemagickxx" != xno \ + && test "x$oln_have_imagemagickxx" = xyes; then MAGICKXX_CPPFLAGS=$IMAGEMAGICKXX_CPPFLAGS MAGICKXX_LDFLAGS=$IMAGEMAGICKXX_LDFLAGS -else +elif test "x$oln_have_graphicsmagickxx" = xyes; then MAGICKXX_CPPFLAGS=$GRAPHICSMAGICKXX_CPPFLAGS MAGICKXX_LDFLAGS=$GRAPHICSMAGICKXX_LDFLAGS fi