Mercurial > octave-nkf
changeset 12042:4cd9c36b705e release-3-2-x
Makeconf.in (MAGICK_LIBS): Don't pass --ldflags to $(MAGICK_CONFIG)
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 25 Jul 2009 16:16:59 +0200 |
parents | 1d4212b80713 |
children | 2246eadc1bb3 |
files | ChangeLog Makeconf.in |
diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 16 11:56:44 2009 -0400 +++ b/ChangeLog Sat Jul 25 16:16:59 2009 +0200 @@ -1,3 +1,7 @@ +2009-07-16 John W. Eaton <jwe@octave.org> + + * Makeconf.in (MAGICK_LIBS): Don't pass --ldflags to $(MAGICK_CONFIG). + 2009-07-09 John W. Eaton <jwe@octave.org> * configure.in: Don't use system strftime on MinGW systems.
--- a/Makeconf.in Thu Jul 16 11:56:44 2009 -0400 +++ b/Makeconf.in Sat Jul 25 16:16:59 2009 +0200 @@ -153,7 +153,7 @@ MAGICK_CONFIG = @MAGICK_CONFIG@ MAGICK_INCFLAGS = $(shell $(MAGICK_CONFIG) --cppflags) -MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --ldflags --libs) +MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --libs) LIBFLAGS = -L$(TOPDIR)